diff -Naur gallery-1.5.4/administer_startpage.php gallery-1.5.5/administer_startpage.php --- gallery-1.5.4/administer_startpage.php 2006-03-27 17:32:14.000000000 +0200 +++ gallery-1.5.5/administer_startpage.php 2006-11-12 10:19:06.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: administer_startpage.php 13338 2006-03-27 15:32:14Z jenst $ + * $Id: administer_startpage.php 15164 2006-11-12 09:19:06Z jenst $ * */ ?> @@ -37,11 +37,11 @@ $adminOptions[] = array( 'text' => _("Rebuild highlights"), 'url' => doCommand('rebuild_highlights'), - 'longtext' => _("Recreate all highlights according to the setting in configwizard.
(Starts immediately)") + 'longtext' => _("Recreate all highlights according to the setting in Config Wizard.
(Starts immediately)") ); $adminOptions[] = array( - 'text' => _("Albumorder"), + 'text' => _("Album Order"), 'url' => makeGalleryUrl('administer_startpage.php', array('sort' => 1, 'type' => 'popup')), 'longtext' => _("Sort the albums on the startpage(s).
(Opens an option dialog)") ); @@ -51,7 +51,7 @@ $sortOptions = array( 'name' => _("By (physical) name"), 'clicks_date' => _("By last reset date"), - 'creation_date' => _("By creation date (works only with albums created with 1.5.2-cvs-b28 or newer)") + 'creation_date' => _("By creation date (works only with albums created with 1.5.2 or newer)") ); doctype(); diff -Naur gallery-1.5.4/album_permissions.php gallery-1.5.5/album_permissions.php --- gallery-1.5.4/album_permissions.php 2006-04-11 00:19:30.000000000 +0200 +++ gallery-1.5.5/album_permissions.php 2006-10-12 23:30:11.000000000 +0200 @@ -2,22 +2,22 @@ /* * Gallery - a web based photo album viewer and editor * Copyright (C) 2000-2006 Bharat Mediratta - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or (at * your option) any later version. - * + * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: album_permissions.php 13433 2006-04-10 22:19:30Z jenst $ + * $Id: album_permissions.php 14800 2006-10-12 21:30:11Z jenst $ */ ?> user->isAdmin() && +if (!$gallery->user->isAdmin() && !$gallery->user->isOwnerOfAlbum($gallery->album)) { echo _("You are not allowed to perform this action!"); exit; @@ -140,7 +140,7 @@ foreach($perms as $perm => $permDesc) { $permsTable->addElement(array('content' => $permDesc, 'cellArgs' => array('colspan' => 2))); $permsTable->addElement( - array('content' => + array('content' => "\n\t\">
". "\n\t" )); @@ -149,7 +149,7 @@ ); } echo $permsTable->render(); -?> +?> diff -Naur gallery-1.5.4/albums.php gallery-1.5.5/albums.php --- gallery-1.5.4/albums.php 2006-04-05 00:13:34.000000000 +0200 +++ gallery-1.5.5/albums.php 2006-09-11 01:54:55.000000000 +0200 @@ -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: albums.php 13362 2006-04-04 22:13:34Z jenst $ + * $Id: albums.php 14503 2006-09-10 23:54:55Z jenst $ */ ?> app->galleryTitle); + + doctype(); ?> - <?php echo $gallery->app->galleryTitle ?> + <?php echo $title ?> 1) { ?> - - - + $topUrl = makeGalleryUrl('albums.php', array('set_albumListPage' => 1)); + $firstUrl = makeGalleryUrl('albums.php',array('set_albumListPage' => 1)); + $prevUrl = makeGalleryUrl('albums.php', array('set_albumListPage' => $navigator['page']-1)); + $nextUrl = makeGalleryUrl('albums.php', array('set_albumListPage' => $navigator['page']+1)); + $lastUrl = makeGalleryUrl('albums.php', array('set_albumListPage' => $maxPages)); + + if ($navigator['page'] > 1) { +?> + + + - - + + app->rssEnabled == "yes" && !$gallery->session->offline) { - $title = sprintf(gTranslate('core', "%s RSS"), $gallery->app->galleryTitle); - $rssHref = $gallery->app->photoAlbumURL . "/rss.php" + $rssTitle = sprintf(gTranslate('core', "%s RSS"), $title); + $rssHref = $gallery->app->photoAlbumURL . "/rss.php"; + + echo ""; + } ?> - - session->offline && - ( ($gallery->app->showSearchEngine == 'yes' && $numPhotos != 0) || + ( ($gallery->app->showSearchEngine == 'yes' && $numPhotos != 0) || $GALLERY_EMBEDDED_INSIDE == 'phpBB2')) { ?> @@ -192,26 +201,26 @@ if ($gallery->user->isLoggedIn() && !$gallery->session->offline) { if ($gallery->user->isAdmin()) { - + $iconText = getIconText('unsortedList.gif', gTranslate('core', "Administer startpage")); $linkurl = makeGalleryUrl('administer_startpage.php', array('type' => 'popup')); $iconElements[] = popup_link($iconText, $linkurl, true); - + $iconText = getIconText('kdf.gif', gTranslate('core', "admin page")); $iconElements[] = ''. $iconText .' '; - + $docsUrl = galleryDocs('admin'); if ($docsUrl) { $iconText = getIconText('info.gif', gTranslate('core', "documentation")); $iconElements[] = "". $iconText .''; } } - + if ($gallery->userDB->canModifyUser()) { $iconText = getIconText('yast_sysadmin.gif', gTranslate('core', "preferences")); $iconElements[] = popup_link($iconText, "user_preferences.php", false, true, 500, 500); } - + if (!$GALLERY_EMBEDDED_INSIDE) { $iconText = getIconText('exit.gif', gTranslate('core', "logout")); $iconElements[] = ''. $iconText .''; @@ -351,7 +360,7 @@ echo editField($gallery->album, "title", $albumURL); if ($gallery->user->canDownloadAlbum($gallery->album) && $gallery->album->numPhotos(1)) { $iconText = getIconText('compressed.png', gTranslate('core', "Download entire album as archive"), 'yes'); - echo popup_link($iconText, "download.php?set_albumName=$tmpAlbumName",false,false,500,500); + echo popup_link($iconText, "download.php?set_albumName=$tmpAlbumName",false,false,500,500); } ?> @@ -414,7 +423,7 @@ } echo "\n
"; - + /* * Created / Last Changed */ @@ -426,7 +435,7 @@ else { printf(gTranslate('core', "Last changed on %s."), $lastModifiedDate); } - + /* * Amount of items */ @@ -434,13 +443,13 @@ list($visibleItems) = $gallery->album->numItems($gallery->user, true); echo gTranslate('core', "This album contains 1 item.", "This album contains %d items.", $visibleItems); - + /* * Click counter + reset for it */ if (!($gallery->album->fields["display_clicks"] == "no") && !$gallery->session->offline) { $clickCount = $gallery->album->getClicks(); - + echo "\n
"; printf(gTranslate('core', "This album has been viewed %s since %s."), gTranslate('core', "1 time", "%d times", $clickCount, gTranslate('core', "0 times")), @@ -451,7 +460,7 @@ (!($gallery->album->fields["display_clicks"] == "no"))) { echo " ".popup_link("[" . gTranslate('core', "reset counter") ."]", doCommand("reset-album-clicks", array("set_albumName" => $albumName), "albums.php"), 1); } - + /* * Comment Indicator */ @@ -468,7 +477,7 @@ echo "\n"; // End Album Infos - + // Start tree if ( isset($gallery->app->albumTreeDepth) && $gallery->app->albumTreeDepth > 0) if (isset($gallery->app->microTree) && $gallery->app->microTree == 'yes') { ?> diff -Naur gallery-1.5.4/ChangeLog gallery-1.5.5/ChangeLog --- gallery-1.5.4/ChangeLog 2006-08-15 14:00:40.000000000 +0200 +++ gallery-1.5.5/ChangeLog 2006-11-12 18:29:56.000000000 +0100 @@ -1,16 +1,141 @@ -2006-08-15 Jens Tkotz +2006-11-122 Chris Kelly 1.5.5 - *** Re-Release 1.5.4 *** +* Release: 1.5.5 - * Forgot tools folder. +2006-11-12 Jens Tkotz 1.5.5-svn-b21 - * Fixed very litle bug sneaked in b15. + * Fix: Little CSS issue in config wizard. + + * Fix: More Typos. + +2006-11-12 Jens Tkotz 1.5.5-svn-b20 + + * Fix: Vertical Flip was broken in rotate/flip dialog. + + * Fix: Typos. + + Thanks to C.M. aka H.P. + +2006-11-12 Jens Tkotz 1.5.5-svn-b19 + + * Fix: Embedded slideshow in low mode. + + * Change: Added class "g-photo" around every thumb and photo. + So its easier controllable via CSS. + + * Change: Make textarea in edit_field a little bigger. + +2006-10-12 Jens Tkotz 1.5.5-svn-b18 + + * Reverted b17 Change + + * Change: removed unneeded $gallery->align from lib/lang.php + + * Use of gTranslate at some places. + +2006-10-12 Jens Tkotz 1.5.5-svn-b16 + +* Fix: #1487824, allow negative alignment for watermark. + +2006-10-12 Jens Tkotz 1.5.5-svn-b15 + + * Fix: #1299913 ; $_REQUEST['name'] is now NOT longer an indicator for + being embedded. + +2006-10-10 Jens Tkotz 1.5.5-svn-b14 + + * Change: Better failure handling for eCards. + + * Fix: eCard preview did not work embedded. + +2006-09-28 Jens Tkotz 1.5.5-svn-b13 + + * Fix: The preference for normal/full when browsing an album was broken since Gallery 1.5.2 + Thanks to mg66 from forums. + +2006-09-16 Jens Tkotz 1.5.5-svn-b12 + + * Fix/Change: lib/lang.php + - initlanguage() was called to late in init.php. + This results in a Call to undefined function: _() + + - Added second param $userlanguage to initlanguage() + If this is set a reinit is forced. + + - Check in init.php for user language if this is different then + already initialized $gallery->language, do a reinit. + + - Enhanced the emulation of gettext and ngettext to adjust with possible reinit. + +2006-09-16 Jens Tkotz 1.5.5-svn-b11 + + * Update: wz_tooltip.js v. 3.38 + + * Update: wz_jsgraphics.js v. 2.36 + +2006-09-11 Jens Tkotz 1.5.5-svn-b10 + + * Fix: Use htmlspecialchars() also in .. + +2006-09-11 Jens Tkotz 1.5.5-svn-b9 + + * Fix: Use htmlspecialchars() in + to avoid problems with links in album and Gallery title. + +2006-09-11 Jens Tkotz 1.5.5-svn-b8 + + * Fix: If magic_quotes are On, stripslashes were called after sanitizing + the input. + This results in the fact that links in input with quotes were not + regocnized. + + * Fix: Use stripslashes_deep() on Input. + +2006-09-08 Jens Tkotz 1.5.5-svn-b7 + + * Change: Enhanced wording in config. + + * Fix: Little CSS for for .g-littlered. + +2006-09-08 Jens Tkotz 1.5.5-svn-b6 + + * Fix: Added additional --keyword in xgettext calls to support gettext 0.15 + +2006-09-04 Jens Tkotz 1.5.5-svn-b5 + + * Fix: Preloading fix from b1 was not fully correct. + + * Change: centered photo and navigation when embedded. + + * Fix: HTML fix in ecard form. + +2006-09-04 Jens Tkotz 1.5.5-svn-b4 + + * Fix: Shadow frame files were corrupted ?!? + +2006-09-02 Jens Tkotz 1.5.5-svn-b3 + + * Fix: Fix for next Tab in b1 was not fully correct. + +2006-09-02 Jens Tkotz 1.5.5-svn-b2 + + * Fix: Link to colorpicker was broken. + (Thanks to chasba from IRC) + +2006-09-02 Jens Tkotz 1.5.5-svn-b1 + + * Fix: Font color issue in multifile Js + + * Fix: "next tab" was broken in Config + + * Fix: Preloading feature in FF does not increase the counter + in view_album and view_photo. + (Thanks to Jade) 2006-08-14 Jens Tkotz *** Release: 1.5.4 *** - 2006-08-14 Jens Tkotz 1.5.4-svn-b17 * Fix: #1444556; diff -Naur gallery-1.5.4/classes/Mail/htmlMimeMail.php gallery-1.5.5/classes/Mail/htmlMimeMail.php --- gallery-1.5.4/classes/Mail/htmlMimeMail.php 2006-06-19 14:04:01.000000000 +0200 +++ gallery-1.5.5/classes/Mail/htmlMimeMail.php 2006-06-19 14:04:01.000000000 +0200 @@ -7,7 +7,7 @@ /** * Filename.......: class.html.mime.mail.inc * Project........: HTML Mime mail class - * Last Modified..: $Date: 2006-06-19 14:04:01 +0200 (Mon, 19 Jun 2006) $ + * Last Modified..: $Date: 2006-06-19 08:04:01 -0400 (Mon, 19 Jun 2006) $ * CVS Revision...: $Revision: 13848 $ * Copyright......: 2001, 2002 Richard Heyes * @package Mail diff -Naur gallery-1.5.4/css/base.css.default gallery-1.5.5/css/base.css.default --- gallery-1.5.4/css/base.css.default 2006-08-14 09:41:08.000000000 +0200 +++ gallery-1.5.5/css/base.css.default 2006-09-09 21:13:40.000000000 +0200 @@ -11,7 +11,7 @@ Some of the styles below are overridden by specific album properties. - $Id: base.css.default 14310 2006-08-14 07:41:08Z jenst $ + $Id: base.css.default 14491 2006-09-09 19:13:40Z jenst $ */ @@ -184,6 +184,10 @@ margin-bottom: 10px; } +.modnavboxthumbs td, .modnavbox td{ + text-align: center; +} + .nav /* used in navigation bars */ { font-size: 12px; @@ -338,10 +342,6 @@ .popup td { } -.popup { - color: #FFF; -} - /* CSS ID for the add photos popup */ #container { @@ -457,7 +457,7 @@ margin-bottom: 5px; } -.littlered { +.littlered, .g-littlered { font-size: 10px; color:red; vertical-align:top; diff -Naur gallery-1.5.4/css/config.css.default gallery-1.5.5/css/config.css.default --- gallery-1.5.4/css/config.css.default 2006-08-14 09:41:08.000000000 +0200 +++ gallery-1.5.5/css/config.css.default 2006-11-12 10:19:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - $Id: config.css.default 14310 2006-08-14 07:41:08Z jenst $ + $Id: config.css.default 15164 2006-11-12 09:19:06Z jenst $ Gallery - a web based photo album viewer and editor Copyright (C) 2000-2006 Bharat Mediratta @@ -105,7 +105,8 @@ background-color: #9191FF; color:#FFFFFF; padding:2px; width: 60%; - margin-top: -10px; margin-bottom: 5px; + margin-top: 1px; + margin-bottom: 5px; } .inner { @@ -138,8 +139,11 @@ a:visited, a:hover { color: #409D27; } -.littlered { font-size: 10px; color:red; vertical-align:top; - } +.littlered, .g-littlered { + font-size: 10px; + color:red; + vertical-align:top; +} .g-tabset { width: 100%; diff -Naur gallery-1.5.4/css/screen.css.default gallery-1.5.5/css/screen.css.default --- gallery-1.5.4/css/screen.css.default 2006-08-14 09:41:08.000000000 +0200 +++ gallery-1.5.5/css/screen.css.default 2006-09-16 01:21:56.000000000 +0200 @@ -13,7 +13,7 @@ Some of the styles below are overriden by specific album properties. These are noted - $Id: screen.css.default 14310 2006-08-14 07:41:08Z jenst $ + $Id: screen.css.default 14534 2006-09-15 23:21:56Z jenst $ */ @@ -58,10 +58,6 @@ color: #000000; } -.popup { - color: #FFFFFF; -} - textarea:focus, input:focus { background-color: #FFFFDA; } diff -Naur gallery-1.5.4/docs/g1package/gallery1-install.faq.a.html gallery-1.5.5/docs/g1package/gallery1-install.faq.a.html --- gallery-1.5.4/docs/g1package/gallery1-install.faq.a.html 2006-08-15 14:21:29.000000000 +0200 +++ gallery-1.5.5/docs/g1package/gallery1-install.faq.a.html 2006-11-12 18:36:48.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.4/docs/g1package/gallery1-install.faq.b.html gallery-1.5.5/docs/g1package/gallery1-install.faq.b.html --- gallery-1.5.4/docs/g1package/gallery1-install.faq.b.html 2006-08-15 14:21:29.000000000 +0200 +++ gallery-1.5.5/docs/g1package/gallery1-install.faq.b.html 2006-11-12 18:36:48.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.4/docs/g1package/gallery1-install.faq.c.html gallery-1.5.5/docs/g1package/gallery1-install.faq.c.html --- gallery-1.5.4/docs/g1package/gallery1-install.faq.c.html 2006-08-15 14:21:30.000000000 +0200 +++ gallery-1.5.5/docs/g1package/gallery1-install.faq.c.html 2006-11-12 18:36:49.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.4/docs/g1package/gallery1-install.faq.d.html gallery-1.5.5/docs/g1package/gallery1-install.faq.d.html --- gallery-1.5.4/docs/g1package/gallery1-install.faq.d.html 2006-08-15 14:21:30.000000000 +0200 +++ gallery-1.5.5/docs/g1package/gallery1-install.faq.d.html 2006-11-12 18:36:49.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.4/docs/g1package/index.html gallery-1.5.5/docs/g1package/index.html --- gallery-1.5.4/docs/g1package/index.html 2006-08-15 14:21:31.000000000 +0200 +++ gallery-1.5.5/docs/g1package/index.html 2006-11-12 18:36:51.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: Tue Aug 15 14:21:27 CEST 2006 + Documentation last generated on: Sun Nov 12 12:36:44 EST 2006

       Next
       Chapter 1. Gallery 1.x Installation Guide
    diff -Naur gallery-1.5.4/download.php gallery-1.5.5/download.php --- gallery-1.5.4/download.php 2006-03-27 17:32:14.000000000 +0200 +++ gallery-1.5.5/download.php 2006-11-12 10:05: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: download.php 13338 2006-03-27 15:32:14Z jenst $ +* $Id: download.php 15163 2006-11-12 09:05:55Z jenst $ */ ?> 0) { - echo '

    '. sprintf(gTranslate('core', "Approximitaly size of zipfile: %s"), formatted_filesize($albumSize)) .'

    '; + echo '

    '. sprintf(gTranslate('core', "Approximate size of zipfile: %s"), formatted_filesize($albumSize)) .'

    '; echo makeFormIntro('download.php', array('onChange' => 'document.g1_form.submit()'), array('gallery_popup' => 'true')); diff -Naur gallery-1.5.4/ecard_form.php gallery-1.5.5/ecard_form.php --- gallery-1.5.4/ecard_form.php 2006-05-02 11:59:13.000000000 +0200 +++ gallery-1.5.5/ecard_form.php 2006-10-10 14:41:57.000000000 +0200 @@ -19,8 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: ecard_form.php 13579 2006-05-02 09:59:13Z jenst $ - */ + * $Id: ecard_form.php 14746 2006-10-10 12:41:57Z jenst $ +*/ ?> album->getPhoto($ecard['photoIndex'])) { +if(!$photo = $gallery->album->getPhoto($ecard['photoIndex'])) { echo gallery_error($errortext); - echo "\n

    "; - echo galleryLink(makeGalleryUrl(), "Back to Gallery"); + echo "\n

    "; + echo ''; + echo "
    "; exit; - } +} - /* Get the dimensions of the sized Photo */ - list($width, $height) = $photo->getDimensions(0, false); +/* Get the dimensions of the sized Photo */ +list($width, $height) = $photo->getDimensions(0, false); - $max_length = 300; // Maximum length of the e-Card text - $msgTextError1 = _("Error processing e-card. Please try later."); - $msgTextError2 = _("Some input fields are not correctly filled out. Please fill out."); - $ecard_PLAIN_data = _("You have an e-card as attachment. Click to see."); - - $error_msg = ''; - - $ecard_send = false; - if (! empty($submit_action)) { - - if (check_email($ecard["email_recepient"]) && - check_email($ecard["email_sender"]) && - ! empty($ecard["email_recepient"]) && - ! empty($ecard["name_sender"])) { - if (strlen($ecard["message"]) > $max_length) { - $ecard["message"] = substr($ecard["message"],0,$max_length-1); - } - list($error,$ecard_data_to_parse) = get_ecard_template($ecard["template_name"]); - if ($error) { - $error_msg = $msgTextError1; - } else { - $ecard_HTML_data = parse_ecard_template($ecard,$ecard_data_to_parse, false); - $result = send_ecard($ecard,$ecard_HTML_data,$ecard_PLAIN_data); - if ($result) { - $ecard_send = true; - } else { - $error_msg = $msgTextError1; - } - } - } else { - $error_msg = $msgTextError2; - } - } else { - if (!isset($ecard["image_name"])) { - $ecard["image_name"] = $photo->getPhotoPath($gallery->album->fields['name'], false); - } +$max_length = 300; // Maximum length of the e-Card text +$ecard_PLAIN_data = gTranslate('core', "You have an e-card as attachment. Click to see."); +$error_msg = ''; +$mandatory = array('name_sender', 'email_sender', 'name_recepient', 'email_recepient', 'message'); +$ecard_send = false; + +if (! empty($submit_action)) { + foreach ($mandatory as $mandatoryField) { + if(empty($ecard[$mandatoryField])) { + $error_msg .= gTranslate('core', "Some input fields are not correctly filled out. Please fill out.") . '
    '; + $error_msg .= '
    '; + break; + } + } + + if (!check_email($ecard["email_recepient"]) || !check_email($ecard["email_sender"])) { + $error_msg .= gTranslate('core', "The sender or recepient email adress is not valid."); + $error_msg .= '
    '; + } + + if (strlen($ecard["message"]) > $max_length) { + $ecard["message"] = substr($ecard["message"],0,$max_length-1); + } + + list($error,$ecard_data_to_parse) = get_ecard_template($ecard["template_name"]); + if ($error) { + $error_msg .= gTranslate('core', "Couldn't load the ecard template. Please contact the Gallery admin!"); + $error_msg .= '
    '; + } + + if (empty($error_msg)) { + $ecard_HTML_data = parse_ecard_template($ecard,$ecard_data_to_parse, false); + $result = send_ecard($ecard,$ecard_HTML_data,$ecard_PLAIN_data); + if ($result) { + $ecard_send = true; + } + else { + $error_msg .= gTranslate('core', "Problem with sending the eCard. Please contact the Gallery admin!"); + $error_msg .= '
    '; + } + } +} +else { + if (!isset($ecard["image_name"])) { + $ecard["image_name"] = $photo->getPhotoPath($gallery->album->fields['name'], false); } -?> +} +?> -album->getThumbnailTag($photoIndex); - if (!empty($error_msg)) { - echo '

    '. gallery_error($error_msg) .'

    '; - } +album->getThumbnailTag($ecard['photoIndex']); + if (!empty($error_msg)) { + echo '

    '. gallery_error($error_msg) .'

    '; + } echo makeFormIntro("ecard_form.php", - array("name" => "ecard_form"), - array("type" => "popup")); + array("name" => "ecard_form"), + array("type" => "popup")); ?> - "> + "> - +
    - + - + - + user) && $gallery->user->isLoggedIn()) { - $defaultSenderName = $gallery->user->displayName(); - $defaultSenderEmail = $gallery->user->getEmail(); - } + $defaultSenderName = ''; + $defaultSenderEmail = ''; + if (! empty($gallery->user) && $gallery->user->isLoggedIn()) { + $defaultSenderName = $gallery->user->displayName(); + $defaultSenderEmail = $gallery->user->getEmail(); + } + + $name_sender = empty($ecard[name_sender]) ? $defaultSenderName : $ecard['name_sender']; + $email_sender = empty($ecard[name_sender]) ? $defaultSenderEmail : $ecard['email_sender']; ?> - + - - + + - - + + - - + + - - + + - +
     
    @@ -253,33 +270,34 @@ - - + + - - + +
    ">">">">  ">">">">
    -

    album->getThumbnailTag($ecard['photoIndex']); ?>


    - +
    $photoIndex); - $validation_file = basename(__FILE__); - if (! isset($GALLERY_EMBEDDED_INSIDE)) { - print gallery_validation_link($validation_file, true, $validation_args); - } +$validation_args = array('photoIndex' => $photoIndex); +$validation_file = basename(__FILE__); +if (! isset($GALLERY_EMBEDDED_INSIDE)) { + print gallery_validation_link($validation_file, true, $validation_args); +} ?> diff -Naur gallery-1.5.4/ecard_preview.php gallery-1.5.5/ecard_preview.php --- gallery-1.5.4/ecard_preview.php 2006-03-27 17:32:14.000000000 +0200 +++ gallery-1.5.5/ecard_preview.php 2006-10-10 14:41:57.000000000 +0200 @@ -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: ecard_preview.php 13338 2006-03-27 15:32:14Z jenst $ + * $Id: ecard_preview.php 14746 2006-10-10 12:41:57Z jenst $ */ ?> album)) { + $pieces = explode('/', $ecard['image_name']); + $gallery->album = new Album; + $gallery->album->load($pieces[0]); +} + list($error,$ecard_data_to_parse) = get_ecard_template($ecard["template_name"]); if (!empty($error)) { diff -Naur gallery-1.5.4/edit_appearance.php gallery-1.5.5/edit_appearance.php --- gallery-1.5.4/edit_appearance.php 2006-08-14 09:41:08.000000000 +0200 +++ gallery-1.5.5/edit_appearance.php 2006-09-24 00:51:34.000000000 +0200 @@ -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: edit_appearance.php 14310 2006-08-14 07:41:08Z jenst $ + * $Id: edit_appearance.php 14595 2006-09-23 22:51:34Z jenst $ */ ?> user->canWriteToAlbum($gallery->album)) { - echo _("You are not allowed to perform this action!"); + echo gTranslate('core', "You are not allowed to perform this action!"); exit; } @@ -53,7 +53,7 @@ list($status, ${$fieldName}, $infoMessage) = sanityCheck(${$fieldName}, $properties[$fieldName]['vartype'], $gallery->app->default[$fieldName]); if (!empty($infoMessage)) { - $infoMessages[] .= sprintf (_("Problem with input of field '%s'. %s"), $fieldName, $infoMessage); + $infoMessages[] .= sprintf (gTranslate('core', "Problem with input of field '%s'. %s"), $fieldName, $infoMessage); } } } @@ -116,9 +116,9 @@ $gallery->album->fields["voter_class"] == "Everybody" && sizeof($gallery->album->fields["votes"]) > 0) { $error = "
    " . - sprintf(_("Warning: you have changed voters from %s to %s. It is advisable to reset the poll to remove all previous votes."), - "". _("Everybody") ."", - "". _("Logged in") .""); + sprintf(gTranslate('core', "Warning: you have changed voters from %s to %s. It is advisable to reset the poll to remove all previous votes."), + "". gTranslate('core', "Everybody") ."", + "". gTranslate('core', "Logged in") .""); } $gallery->album->fields["voter_class"] = $voter_class; $gallery->album->fields["poll_scale"] = $poll_scale; @@ -146,7 +146,7 @@ } if (sizeof ($gallery->album->getExtraFields()) < $num_fields) { - $gallery->album->setExtraFields(array_pad($gallery->album->getExtraFields(), $num_fields, _("untitled field"))); + $gallery->album->setExtraFields(array_pad($gallery->album->getExtraFields(), $num_fields, gTranslate('core', "untitled field"))); } if (sizeof ($gallery->album->getExtraFields()) > $num_fields) { @@ -182,8 +182,8 @@ } $multiple_choices_EF = array( - 'Title' => _("Title"), - 'AltText' => _("Alt Text / onMouseOver") + 'Title' => gTranslate('core', "Title"), + 'AltText' => gTranslate('core', "Alt Text / onMouseOver") ); $extra_fields = $gallery->album->getExtraFields(); @@ -213,7 +213,7 @@ $customFields["cf_$i"] = array( 'name' => 'extra_fields[]', - 'prompt' => sprintf(_("Field %s:"),$i), + 'prompt' => sprintf(gTranslate('core', "Field %s:"),$i), 'desc' => '', 'type' => 'text', 'value' => $value @@ -228,7 +228,7 @@ ?> - <?php echo _("Album Properties") ?> + <?php echo gTranslate('core', "Album Properties") ?> @@ -293,12 +293,12 @@
    - +

    -"> -"> -" onclick='parent.close()'> +"> +"> +" onclick='parent.close()'> diff -Naur gallery-1.5.4/edit_field.php gallery-1.5.5/edit_field.php --- gallery-1.5.4/edit_field.php 2006-03-28 12:54:53.000000000 +0200 +++ gallery-1.5.5/edit_field.php 2006-11-12 00:10:21.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: edit_field.php 13349 2006-03-28 10:54:53Z jenst $ + * $Id: edit_field.php 15147 2006-11-11 23:10:21Z jenst $ */ ?> - +

    "> " onclick='parent.close()'> diff -Naur gallery-1.5.4/html_wrap/frames/shadows/pixel_trans.png gallery-1.5.5/html_wrap/frames/shadows/pixel_trans.png --- gallery-1.5.4/html_wrap/frames/shadows/pixel_trans.png 2003-11-22 19:33:59.000000000 +0100 +++ gallery-1.5.5/html_wrap/frames/shadows/pixel_trans.png 2006-09-04 09:37:37.000000000 +0200 @@ -1,4 +1,3 @@ -‰PNG +‰PNG  - -IHDR(Ë4» pHYs  šœgAMAØëõª cHRMn tYë…ñkôòTHâ_ÐÇPLTEÿÿÿ #·átRNS@æØf IDATxÚbb0ˆœ¸—IEND®B`‚ \ Pas de fin de ligne à la fin du fichier. + IHDR(Ë4» pHYs  šœgAMAØëõª cHRMn tYë…ñkôòTHâ_ÐÇPLTEÿÿÿ #·átRNS@æØf IDATxÚbb0ˆœ¸—IEND®B`‚ \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.4/html_wrap/inline_imagewrap.inc gallery-1.5.5/html_wrap/inline_imagewrap.inc --- gallery-1.5.4/html_wrap/inline_imagewrap.inc 2006-03-27 18:07:16.000000000 +0200 +++ gallery-1.5.5/html_wrap/inline_imagewrap.inc 2006-11-12 00:10:21.000000000 +0100 @@ -1,5 +1,5 @@ 0 && $borderColor != '') { + $dashedBorder = "border:${borderWidth}px dashed $borderColor"; + $solidBorder = "border:${borderWidth}px solid $borderColor"; +} + +$style = "margin: 0 auto; width:${imageWidth}px; height:${imageHeight}px"; + switch ($frame) { // special cases case "none": - echo $href_tag; + echo "

    $href_tag
    "; break; + case "dots": ?> -
    ">
    +
    ">
    -
    ">
    +
    ">
    - +
    @@ -98,7 +106,7 @@
    " border="0" width="" height="" alt="">
    		 - +
    		@@ -141,10 +149,10 @@
    " border="0" width="" height="" alt="">
    -$href_tag"; } break; } diff -Naur gallery-1.5.4/includes/errors/unconfigured.php gallery-1.5.5/includes/errors/unconfigured.php --- gallery-1.5.4/includes/errors/unconfigured.php 2005-07-19 22:57:25.000000000 +0200 +++ gallery-1.5.5/includes/errors/unconfigured.php 2006-09-09 21:13:40.000000000 +0200 @@ -1,7 +1,7 @@ - @@ -15,18 +15,18 @@

    -

    - +
    - + - + @@ -34,15 +34,17 @@

    -', ''); +', ''); echo '
    '; include(dirname(__FILE__) . "/configure_help.php"); ?>

    -', ''); + echo "\n
    "; echo gallery_validation_link('index.php', true); ?> diff -Naur gallery-1.5.4/includes/slideshow/high.inc gallery-1.5.5/includes/slideshow/high.inc --- gallery-1.5.4/includes/slideshow/high.inc 2006-03-27 17:32:14.000000000 +0200 +++ gallery-1.5.5/includes/slideshow/high.inc 2006-11-12 00:10:21.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: high.inc 13338 2006-03-27 15:32:14Z jenst $ + * $Id: high.inc 15147 2006-11-11 23:10:21Z jenst $ */ ?> - - - - -
    -
    - - -/* Load the first picture */ -setCaption(photo_captions[1]); -preload_photo(1); +
    -/* Start the show. */ -play(); -// --> - + + +
    $gallery->session->albumName, 'mode' => 'low')); ?>"; document.location = slideShowUrl + "&slide_index=" + next_location + "&slide_full=" + full diff -Naur gallery-1.5.4/index.php gallery-1.5.5/index.php --- gallery-1.5.4/index.php 2006-03-27 17:32:14.000000000 +0200 +++ gallery-1.5.5/index.php 2006-10-11 23:29:53.000000000 +0200 @@ -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: index.php 13338 2006-03-27 15:32:14Z jenst $ + * $Id: index.php 14781 2006-10-11 21:29:53Z jenst $ */ ?> app->geeklog_dir) && !realpath($gallery->app->geeklog_dir)) { - print _("Security violation") ."\n"; + print _("Security violation. Geeklog Dir is invalid.") ."\n"; exit; -} elseif (!empty($gallery->app->geeklog_dir)) { +} +elseif (!empty($gallery->app->geeklog_dir)) { $GALLERY_EMBEDDED_INSIDE='GeekLog'; $GALLERY_EMBEDDED_INSIDE_TYPE = 'GeekLog'; @@ -120,7 +120,8 @@ if (isset($gallery->app->devMode) && $gallery->app->devMode == 'yes') { ini_set("display_errors", "1"); error_reporting(E_ALL); -} else { +} +else { error_reporting(E_ALL & ~E_NOTICE); } @@ -162,6 +163,9 @@ */ set_magic_quotes_runtime(0); +// We need to init the language before we include the files below, as they contain gettext calls. +initLanguage(); + /* Load classes and session information * Note: Some classes and libs are loaded in util.php */ @@ -184,7 +188,6 @@ /* Make sure that Gallery is set up properly */ if ($gallerySanity != NULL) { - initLanguage(); include_once(dirname(__FILE__) . "/includes/errors/$gallerySanity"); exit; } @@ -221,7 +224,9 @@ $gallery->session->username = $user_info["uname"]; $gallery->user = $gallery->userDB->getUserByUsername($gallery->session->username); } + break; + case 'phpnuke': /* we're in phpnuke */ include_once(dirname(__FILE__) . "/classes/Database.php"); @@ -277,7 +282,9 @@ $gallery->session->username = $user_info[$gallery->database{'fields'}{'uname'}]; $gallery->user = $gallery->userDB->getUserByUsername($gallery->session->username); } + break; + case 'nsnnuke': /* we're in nsnnuke */ include_once(dirname(__FILE__) . "/classes/Database.php"); @@ -324,9 +331,11 @@ $gallery->session->username = $user_info[$gallery->database{'fields'}{'uname'}]; $gallery->user = $gallery->userDB->getUserByUsername($gallery->session->username); } + break; + case 'phpBB2': - //print_r($GLOBALS['board_config']['version']); + //print_r($GLOBALS['board_config']['version']); include_once(dirname(__FILE__) . "/classes/Database.php"); include_once(dirname(__FILE__) . "/classes/database/mysql/Database.php"); include_once(dirname(__FILE__) . "/classes/phpbb/UserDB.php"); @@ -358,7 +367,9 @@ elseif ($gallery->session->username) { $gallery->user = $gallery->userDB->getUserByUsername($gallery->session->username); } + break; + case 'mambo': case 'joomla': include_once(dirname(__FILE__) . '/classes/Database.php'); @@ -385,7 +396,8 @@ $mosConfig_dbprefix = $gallery->session->mambo->mosConfig_dbprefix; $mosConfig_lang = $gallery->session->mambo->mosConfig_lang; $MOS_GALLERY_PARAMS = $gallery->session->mambo->MOS_GALLERY_PARAMS; - } elseif (!empty($mosConfig_db)) { + } + elseif (!empty($mosConfig_db)) { $gallery->session->mambo->mosRoot = dirname($_SERVER['PHP_SELF']); if (substr($gallery->session->mambo->mosRoot, -1) != '/') { $gallery->session->mambo->mosRoot .= '/'; @@ -397,15 +409,15 @@ $gallery->session->mambo->mosConfig_dbprefix = $mosConfig_dbprefix; $gallery->session->mambo->mosConfig_lang = $mosConfig_lang; $gallery->session->mambo->MOS_GALLERY_PARAMS = $MOS_GALLERY_PARAMS; - } else { + } + else { echo 'init.php: ' . _("Gallery seems to be inside Mambo, but we couldn't get the necessary info."); exit; } $gallery->database{'mambo'} = new MySQL_Database($mosConfig_host, $mosConfig_user, $mosConfig_password, $mosConfig_db); $gallery->database{'user_prefix'} = $mosConfig_dbprefix; - $gallery->database{'fields'} = - array ( + $gallery->database{'fields'} = array ( 'name' => 'name', 'uname' => 'username', 'email' => 'email', @@ -440,7 +452,9 @@ $results = $db->query('SELECT id FROM ' . $gallery->database{'user_prefix'} . "menu WHERE componentid='$componentId' AND type = 'components' AND published = 1"); $row = $db->fetch_row($results); $MOS_GALLERY_PARAMS['itemid'] = $row[0]; // pick the first one + break; + case 'GeekLog': // Cheat, and grab USER information from the global session variables. // Hey, it's faster and easier than reading them out of the database. @@ -467,7 +481,9 @@ if (isset($gallery->session->username)) { $gallery->user = $gallery->userDB->getUserByUsername($gallery->session->username); } + break; + case 'cpgnuke': /* we're in CPG-Nuke */ include_once(dirname(__FILE__) . "/classes/Database.php"); @@ -537,10 +553,17 @@ $gallery->session->username = ""; } -/* Now we init the language - * Its done after initializing the user. +/** + * It maybe, that the user has a different language then the default. + * So we reinit the language after initializing the user. */ -initLanguage(); +if (!empty($gallery->user)) { + $userlanguage = $gallery->user->getDefaultLanguage(); + + if($userlanguage != $gallery->language) { + initLanguage(true, $userlanguage); + } +} if (!isset($gallery->session->offline)) { $gallery->session->offline = FALSE; diff -Naur gallery-1.5.4/js/multifile.js.php gallery-1.5.5/js/multifile.js.php --- gallery-1.5.4/js/multifile.js.php 2006-07-29 05:27:13.000000000 +0200 +++ gallery-1.5.5/js/multifile.js.php 2006-09-02 10:49:28.000000000 +0200 @@ -1,7 +1,7 @@