diff -Naur gallery-1.5.2-pl2/add_comment.php gallery-1.5.3/add_comment.php
--- gallery-1.5.2-pl2/add_comment.php 2006-01-06 07:31:30.000000000 +0100
+++ gallery-1.5.3/add_comment.php 2006-04-06 13:49:10.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: add_comment.php,v 1.56.2.1 2006/01/06 06:31:30 jenst Exp $
+ * $Id: add_comment.php,v 1.57.2.2 2006/04/06 11:49:10 jenst Exp $
*/
?>
$commenter_name, 'comment_text' => $comment_text), false)) {
$error_text = gTranslate('core', "Your Comment contains forbidden words. It will not be added.");
} else {
- $comment_text = strip_tags($comment_text);
+// Uncomment to forbid html in comments.
+// $comment_text = strip_tags($comment_text);
$commenter_name = strip_tags($commenter_name);
$IPNumber = $_SERVER['REMOTE_ADDR'];
$gallery->album->addComment($id, $comment_text, $IPNumber, $commenter_name);
diff -Naur gallery-1.5.2-pl2/add_photos_frame.php gallery-1.5.3/add_photos_frame.php
--- gallery-1.5.2-pl2/add_photos_frame.php 2006-01-06 07:31:30.000000000 +0100
+++ gallery-1.5.3/add_photos_frame.php 2006-03-27 17:31:24.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: add_photos_frame.php,v 1.10.2.1 2006/01/06 06:31:30 jenst Exp $
+ * $Id: add_photos_frame.php,v 1.11.2.1 2006/03/27 15:31:24 jenst Exp $
*/
?>
diff -Naur gallery-1.5.2-pl2/admin-page.php gallery-1.5.3/admin-page.php
--- gallery-1.5.2-pl2/admin-page.php 2006-01-06 07:31:30.000000000 +0100
+++ gallery-1.5.3/admin-page.php 2006-03-27 17:31:24.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: admin-page.php,v 1.17.2.1 2006/01/06 06:31:30 jenst Exp $
+ * $Id: admin-page.php,v 1.18.2.1 2006/03/27 15:31:24 jenst Exp $
*
*/
?>
diff -Naur gallery-1.5.2-pl2/album_permissions.php gallery-1.5.3/album_permissions.php
--- gallery-1.5.2-pl2/album_permissions.php 2006-01-06 07:31:30.000000000 +0100
+++ gallery-1.5.3/album_permissions.php 2006-03-27 17:31:24.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: album_permissions.php,v 1.62.2.1 2006/01/06 06:31:30 jenst Exp $
+ * $Id: album_permissions.php,v 1.63.2.1 2006/03/27 15:31:24 jenst Exp $
*/
?>
app->rssEnabled == "yes" && !$gallery->session->offline) {
+ $title = sprintf(gTranslate('core', "%s RSS"), $gallery->app->galleryTitle);
+ $rssHref = $gallery->app->photoAlbumURL . "/rss.php"
?>
- app->galleryTitle) ?>" href="app->photoAlbumURL . "/rss.php" ?>" type="application/rss+xml">
+
@@ -419,7 +421,7 @@
$creationDate = $gallery->album->getCreationDate();
$lastModifiedDate = $gallery->album->getLastModificationDate();
if($creationDate) {
- printf(_("Created on %s, last changed on %s."), $creationDate, $lastModifiedDate);
+ printf(gTranslate('core', "Created on %s, last changed on %s."), $creationDate, $lastModifiedDate);
}
else {
printf(gTranslate('core', "Last changed on %s."), $lastModifiedDate);
diff -Naur gallery-1.5.2-pl2/block-random.php gallery-1.5.3/block-random.php
--- gallery-1.5.2-pl2/block-random.php 2006-01-06 07:31:30.000000000 +0100
+++ gallery-1.5.3/block-random.php 2006-03-27 17:31:24.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: block-random.php,v 1.17.2.1 2006/01/06 06:31:30 jenst Exp $
+ * $Id: block-random.php,v 1.18.2.1 2006/03/27 15:31:24 jenst Exp $
*/
/*
* This block selects a random photo for display. It will only display photos
diff -Naur gallery-1.5.2-pl2/captionator.php gallery-1.5.3/captionator.php
--- gallery-1.5.2-pl2/captionator.php 2006-01-06 07:31:30.000000000 +0100
+++ gallery-1.5.3/captionator.php 2006-03-27 17:31:24.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: captionator.php,v 1.69.2.1 2006/01/06 06:31:30 jenst Exp $
+ * $Id: captionator.php,v 1.70.2.1 2006/03/27 15:31:24 jenst Exp $
*/
?>
1.5.3
+
+ * Release: 1.5.3
+
+2006-04-06 Jens Tkotz 1.5.3-cvs-b23
+
+ * Change: Allow HTML again also in comments and user captions for images.
+
+2006-04-06 Jens Tkotz 1.5.3-cvs-b22
+
+ * Fix: ImageMap was opened was popup when no icons are used.
+
+ * Change: Removed obsolete function showChoice()
+
+2006-04-05 Jens Tkotz 1.5.3-cvs-b21
+
+ * Fix: Frame around movies in photo view was broken.
+
+2006-04-04 Jens Tkotz 1.5.3-cvs-b20
+
+ * Fix: Use gTranslate instead of _( in albums.php, view_album.php and view_photo.php
+
+2006-04-04 Jens Tkotz 1.5.3-cvs-b19
+
+ * Change: Make select boxes in watermark form to stay at the value selected before a preview.
+ Thanks to ejolley from forum.
+ Change done as 1.5.3-cvs-b8 in HEAD
+
+
+ * Change: Added icons for rotate and flip.
+
+ * Change: Layout of rotate_photo.php.
+ Thanks to Volksport.
+ Change done as 1.5.3-cvs-b5 in HEAD
+
+ * Fix: Language Mode 2 (Browserlanguage) was broken.
+
+2006-03-28 Jens Tkotz 1.5.3-cvs-b18
+
+ * SECURITY FIX *
+
+ It was possible to use/"inject" Javascript inside various places to abuse this as a XSS Exploit.
+
+ Now every userinput got from $_REQUEST is sanitized.
+ We use the PEAR packages HTML_Safe and XML_HTMLSax3 to do this.
+ Nice benefit is that HTML is now again possible in captions, titles, etc.
+
+ The Team would like to thank Aditya Mooley for catching and reporting this.
+ And giving us the time to fix it before going to public.
+
+ Aditya Mooley is member of the Coppermine-Gallery Development team.
+ So have a look at http://coppermine.sf.net, the page of our friendly competittion application.
+
+2006-03-27 Jens Tkotz 1.5.3-cvs-b17
+
+ * Fix: In some dropdown boxes the wrong items is selected.
+ Appears e.g. in slideshow in IE where "blend" should be selected, but acutally
+ "RANDOM" is.
+
+ Thanks to Yuan from forums.
+
+2006-03-27 Jens Tkotz 1.5.3-cvs-b16
+
+ * Fix: When Gallery runs in joomla the complete framework is loaded into the
+ progressbar when uploading pictures.
+
+2006-03-27 Jens Tkotz 1.5.3-cvs-b15
+
+ * Fix: Even if owner modification is set to "no" then owner are allowed to hide there pictures.
+ Especially odd when owner is "everybody".
+
+2006-03-27 Jens Tkotz 1.5.3-cvs-b14
+
+ * Fix: When uploading files via the FORM method, the order was reverted in IE and Opera.
+
+2006-03-27 Jens Tkotz 1.5.3-cvs-b13
+
+ * Fix: When border is set to "solid" or "dots" then an unnice space appeared around thumbs.
+
+2006-03-27 Jens Tkotz 1.5.3-cvs-b12
+
+ * Fix: When you have "Can every permitted user see a comments overview" set to 'yes'
+ and then the permitted user goes to the overview he/she will get a "add comment" Button.
+ Regardless wether the user is allowed to add comments, or not.
+
+ This Fix makes the button only appear when user is allowed to add comments.
+
+ Thanks to Yuan from forums.
+
2006-02-06 Chris Kelly 1.5.2-pl2
* Release: 1.5.2-pl2
diff -Naur gallery-1.5.2-pl2/classes/AlbumDB.php gallery-1.5.3/classes/AlbumDB.php
--- gallery-1.5.2-pl2/classes/AlbumDB.php 2006-01-06 07:31:31.000000000 +0100
+++ gallery-1.5.3/classes/AlbumDB.php 2006-03-27 17:31:26.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: AlbumDB.php,v 1.45.2.1 2006/01/06 06:31:31 jenst Exp $
+ * $Id: AlbumDB.php,v 1.47.2.1 2006/03/27 15:31:26 jenst Exp $
*/
?>
+ * @copyright 2004-2005 Roman Ivanov
+ * @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
+ * @version CVS: $Id: Safe.php,v 1.1.2.1 2006/03/28 10:54:52 jenst Exp $
+ * @link http://pear.php.net/package/HTML_Safe
+ */
+
+
+/**
+ * This package requires HTMLSax3 package
+ */
+require_once (dirname(dirname(__FILE__)) .'/XML_HTMLSax3/HTMLSax3.php');
+
+
+/**
+ *
+ * HTML_Safe Parser
+ *
+ * This parser strips down all potentially dangerous content within HTML:
+ *
+ *
opening tag without its closing tag
+ *
closing tag without its opening tag
+ *
any of these tags: "base", "basefont", "head", "html", "body", "applet",
+ * "object", "iframe", "frame", "frameset", "script", "layer", "ilayer", "embed",
+ * "bgsound", "link", "meta", "style", "title", "blink", "xml" etc.
+ *
any of these attributes: on*, data*, dynsrc
+ *
javascript:/vbscript:/about: etc. protocols
+ *
expression/behavior etc. in styles
+ *
any other active content
+ *
+ * It also tries to convert code to XHTML valid, but htmltidy is far better
+ * solution for this task.
+ *
+ * Example:
+ *
+ * @access public
+ */
+ function XML_HTMLSax3() {
+ if (version_compare(phpversion(), '4.3', 'ge')) {
+ $this->state_parser =& new XML_HTMLSax3_StateParser_Gtet430($this);
+ } else {
+ $this->state_parser =& new XML_HTMLSax3_StateParser_Lt430($this);
+ }
+ $nullhandler =& new XML_HTMLSax3_NullHandler();
+ $this->set_object($nullhandler);
+ $this->set_element_handler('DoNothing', 'DoNothing');
+ $this->set_data_handler('DoNothing');
+ $this->set_pi_handler('DoNothing');
+ $this->set_jasp_handler('DoNothing');
+ $this->set_escape_handler('DoNothing');
+ }
+
+ /**
+ * Sets the user defined handler object. Returns a PEAR Error
+ * if supplied argument is not an object.
+ * @param object handler object containing SAX callback methods
+ * @access public
+ * @return mixed
+ */
+ function set_object(&$object) {
+ if ( is_object($object) ) {
+ $this->state_parser->handler_default =& $object;
+ return true;
+ } else {
+ require_once('PEAR.php');
+ PEAR::raiseError('XML_HTMLSax3::set_object requires '.
+ 'an object instance');
+ }
+ }
+
+ /**
+ * Sets a parser option. By default all options are switched off.
+ * Returns a PEAR Error if option is invalid
+ * Available options:
+ *
+ *
XML_OPTION_TRIM_DATA_NODES: trim whitespace off the beginning
+ * and end of data passed to the data handler
+ *
XML_OPTION_LINEFEED_BREAK: linefeeds result in additional data
+ * handler calls
+ *
XML_OPTION_TAB_BREAK: tabs result in additional data handler
+ * calls
+ *
XML_OPTION_ENTITIES_UNPARSED: XML entities are returned as
+ * seperate data handler calls in unparsed form
+ *
XML_OPTION_ENTITIES_PARSED: (PHP 4.3.0+ only) XML entities are
+ * returned as seperate data handler calls and are parsed with
+ * PHP's html_entity_decode() function
+ *
XML_OPTION_STRIP_ESCAPES: strips out the -- -- comment markers
+ * or CDATA markup inside an XML escape, if found.
+ *
+ * To get HTMLSax to behave in the same way as the native PHP SAX parser,
+ * using it's default state, you need to switch on XML_OPTION_LINEFEED_BREAK,
+ * XML_OPTION_ENTITIES_PARSED and XML_OPTION_CASE_FOLDING
+ * @param string name of parser option
+ * @param int (optional) 1 to switch on, 0 for off
+ * @access public
+ * @return boolean
+ */
+ function set_option($name, $value=1) {
+ if ( array_key_exists($name,$this->state_parser->parser_options) ) {
+ $this->state_parser->parser_options[$name] = $value;
+ return true;
+ } else {
+ require_once('PEAR.php');
+ PEAR::raiseError('XML_HTMLSax3::set_option('.$name.') illegal');
+ }
+ }
+
+ /**
+ * Sets the data handler method which deals with the contents of XML
+ * elements.
+ * The handler method must accept two arguments, the first being an
+ * instance of XML_HTMLSax3 and the second being the contents of an
+ * XML element e.g.
+ *
+ * function myDataHander(& $parser,$data){}
+ *
+ * @param string name of method
+ * @access public
+ * @return void
+ * @see set_object
+ */
+ function set_data_handler($data_method) {
+ $this->state_parser->handler_object_data =& $this->state_parser->handler_default;
+ $this->state_parser->handler_method_data = $data_method;
+ }
+
+ /**
+ * Sets the open and close tag handlers
+ * The open handler method must accept three arguments; the parser,
+ * the tag name and an array of attributes e.g.
+ *
+ * function myOpenHander(& $parser,$tagname,$attrs=array()){}
+ *
+ * The close handler method must accept two arguments; the parser and
+ * the tag name e.g.
+ *
+ * function myCloseHander(& $parser,$tagname){}
+ *
+ * @param string name of open method
+ * @param string name of close method
+ * @access public
+ * @return void
+ * @see set_object
+ */
+ function set_element_handler($opening_method, $closing_method) {
+ $this->state_parser->handler_object_element =& $this->state_parser->handler_default;
+ $this->state_parser->handler_method_opening = $opening_method;
+ $this->state_parser->handler_method_closing = $closing_method;
+ }
+
+ /**
+ * Sets the processing instruction handler method e.g. for PHP open
+ * and close tags
+ * The handler method must accept three arguments; the parser, the
+ * PI target and data inside the PI
+ *
+ * function myPIHander(& $parser,$target, $data){}
+ *
+ * @param string name of method
+ * @access public
+ * @return void
+ * @see set_object
+ */
+ function set_pi_handler($pi_method) {
+ $this->state_parser->handler_object_pi =& $this->state_parser->handler_default;
+ $this->state_parser->handler_method_pi = $pi_method;
+ }
+
+ /**
+ * Sets the XML escape handler method e.g. for comments and doctype
+ * declarations
+ * The handler method must accept two arguments; the parser and the
+ * contents of the escaped section
+ *
+ * function myEscapeHander(& $parser, $data){}
+ *
+ * @param string name of method
+ * @access public
+ * @return void
+ * @see set_object
+ */
+ function set_escape_handler($escape_method) {
+ $this->state_parser->handler_object_escape =& $this->state_parser->handler_default;
+ $this->state_parser->handler_method_escape = $escape_method;
+ }
+
+ /**
+ * Sets the JSP/ASP markup handler
+ * The handler method must accept two arguments; the parser and
+ * body of the JASP tag
+ *
+ * function myJaspHander(& $parser, $data){}
+ *
+ * @param string name of method
+ * @access public
+ * @return void
+ * @see set_object
+ */
+ function set_jasp_handler ($jasp_method) {
+ $this->state_parser->handler_object_jasp =& $this->state_parser->handler_default;
+ $this->state_parser->handler_method_jasp = $jasp_method;
+ }
+
+ /**
+ * Returns the current string position of the "cursor" inside the XML
+ * document
+ * Intended for use from within a user defined handler called
+ * via the $parser reference e.g.
+ *
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-pl2/docs/g1package/gallery1-install.faq.b.html gallery-1.5.3/docs/g1package/gallery1-install.faq.b.html
--- gallery-1.5.2-pl2/docs/g1package/gallery1-install.faq.b.html 2006-02-07 03:36:21.000000000 +0100
+++ gallery-1.5.3/docs/g1package/gallery1-install.faq.b.html 2006-04-10 04:16:37.000000000 +0200
@@ -10,7 +10,7 @@
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>
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 @@
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?
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"?
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?
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?
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-pl2/docs/g1package/index.html gallery-1.5.3/docs/g1package/index.html
--- gallery-1.5.2-pl2/docs/g1package/index.html 2006-02-07 03:36:25.000000000 +0100
+++ gallery-1.5.3/docs/g1package/index.html 2006-04-10 04:16:40.000000000 +0200
@@ -1,6 +1,6 @@
-
diff -Naur gallery-1.5.2-pl2/extra_fields.php gallery-1.5.3/extra_fields.php
--- gallery-1.5.2-pl2/extra_fields.php 2006-01-06 07:31:30.000000000 +0100
+++ gallery-1.5.3/extra_fields.php 2006-03-27 17:31:25.000000000 +0200
@@ -19,7 +19,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: extra_fields.php,v 1.34.2.1 2006/01/06 06:31:30 jenst Exp $
+ * $Id: extra_fields.php,v 1.35.2.1 2006/03/27 15:31:25 jenst Exp $
*/
?>
-
">
-
-
+
">
-
">
-
-
- ">
+
+ // Safari/Opera ignore height="100%" for table, but this ensures HTML
+ // standards, so do it for all browsers
+ $hLL = $imageHeight - $heightLLT - $heightLLB;
+ $hRR = $imageHeight - $heightRRT - $heightRRB;
+?>
diff -Naur gallery-1.5.2-pl2/html_wrap/photo.footer.default gallery-1.5.3/html_wrap/photo.footer.default
--- gallery-1.5.2-pl2/html_wrap/photo.footer.default 2006-01-18 19:06:05.000000000 +0100
+++ gallery-1.5.3/html_wrap/photo.footer.default 2006-03-27 17:31:29.000000000 +0200
@@ -1,5 +1,5 @@
p€ÁOP(~
œk èù‰ B8´¹2ZÅn»ß¤ ;
\ Pas de fin de ligne à la fin du fichier.
diff -Naur gallery-1.5.2-pl2/images/icons/imageedit/rotate-180.gif gallery-1.5.3/images/icons/imageedit/rotate-180.gif
--- gallery-1.5.2-pl2/images/icons/imageedit/rotate-180.gif 1970-01-01 01:00:00.000000000 +0100
+++ gallery-1.5.3/images/icons/imageedit/rotate-180.gif 2006-04-06 13:26:21.000000000 +0200
@@ -0,0 +1,3 @@
+GIF89a Õ) ¸ÒÄÔä000Ÿ¹Ò£¼ÕÂÒ㢻ÓÈ×å—®ÆÌÚ礽ձÇÛÁÒ⤶Ÿ¹ÓÊÙå
diff -Naur gallery-1.5.2-pl2/includes/add_photos/add_applet.inc gallery-1.5.3/includes/add_photos/add_applet.inc
--- gallery-1.5.2-pl2/includes/add_photos/add_applet.inc 2006-01-06 07:31:35.000000000 +0100
+++ gallery-1.5.3/includes/add_photos/add_applet.inc 2006-03-27 17:31:29.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: add_applet.inc,v 1.9.2.1 2006/01/06 06:31:35 jenst Exp $
+ * $Id: add_applet.inc,v 1.10.2.1 2006/03/27 15:31:29 jenst Exp $
*/
?>
diff -Naur gallery-1.5.2-pl2/includes/add_photos/add_applet_mini.cfg gallery-1.5.3/includes/add_photos/add_applet_mini.cfg
--- gallery-1.5.2-pl2/includes/add_photos/add_applet_mini.cfg 2006-01-06 07:31:35.000000000 +0100
+++ gallery-1.5.3/includes/add_photos/add_applet_mini.cfg 2006-03-27 17:31:29.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: add_applet_mini.cfg,v 1.3.2.1 2006/01/06 06:31:35 jenst Exp $
+ * $Id: add_applet_mini.cfg,v 1.4.2.1 2006/03/27 15:31:29 jenst Exp $
*/
?>
diff -Naur gallery-1.5.2-pl2/includes/add_photos/add_applet_mini.inc gallery-1.5.3/includes/add_photos/add_applet_mini.inc
--- gallery-1.5.2-pl2/includes/add_photos/add_applet_mini.inc 2006-01-06 07:31:35.000000000 +0100
+++ gallery-1.5.3/includes/add_photos/add_applet_mini.inc 2006-03-27 17:31:29.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: add_applet_mini.inc,v 1.8.2.1 2006/01/06 06:31:35 jenst Exp $
+ * $Id: add_applet_mini.inc,v 1.9.2.1 2006/03/27 15:31:29 jenst Exp $
*/
?>
diff -Naur gallery-1.5.2-pl2/includes/add_photos/add_form.inc gallery-1.5.3/includes/add_photos/add_form.inc
--- gallery-1.5.2-pl2/includes/add_photos/add_form.inc 2006-01-08 21:07:17.000000000 +0100
+++ gallery-1.5.3/includes/add_photos/add_form.inc 2006-03-27 17:31:29.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: add_form.inc,v 1.28.2.3 2006/01/08 20:07:17 jenst Exp $
+ * $Id: add_form.inc,v 1.32.2.1 2006/03/27 15:31:29 jenst Exp $
*/
?>
diff -Naur gallery-1.5.2-pl2/includes/add_photos/add_url.inc gallery-1.5.3/includes/add_photos/add_url.inc
--- gallery-1.5.2-pl2/includes/add_photos/add_url.inc 2006-01-06 07:31:35.000000000 +0100
+++ gallery-1.5.3/includes/add_photos/add_url.inc 2006-03-27 17:31:29.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: add_url.inc,v 1.17.2.1 2006/01/06 06:31:35 jenst Exp $
+ * $Id: add_url.inc,v 1.18.2.1 2006/03/27 15:31:29 jenst Exp $
*/
?>
diff -Naur gallery-1.5.2-pl2/includes/definitions/albumProperties.php gallery-1.5.3/includes/definitions/albumProperties.php
--- gallery-1.5.2-pl2/includes/definitions/albumProperties.php 2006-02-06 22:26:55.000000000 +0100
+++ gallery-1.5.3/includes/definitions/albumProperties.php 2006-03-27 17:31:29.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: albumProperties.php,v 1.10.2.2 2006/02/06 21:26:55 jenst Exp $
+ * $Id: albumProperties.php,v 1.11.2.1 2006/03/27 15:31:29 jenst Exp $
*/
?>
diff -Naur gallery-1.5.2-pl2/includes/slideshow/applet.inc gallery-1.5.3/includes/slideshow/applet.inc
--- gallery-1.5.2-pl2/includes/slideshow/applet.inc 2006-01-06 07:31:36.000000000 +0100
+++ gallery-1.5.3/includes/slideshow/applet.inc 2006-03-27 17:31:29.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: applet.inc,v 1.10.2.1 2006/01/06 06:31:36 jenst Exp $
+ * $Id: applet.inc,v 1.11.2.1 2006/03/27 15:31:29 jenst Exp $
*/
?>
diff -Naur gallery-1.5.2-pl2/index.php gallery-1.5.3/index.php
--- gallery-1.5.2-pl2/index.php 2006-01-06 07:31:30.000000000 +0100
+++ gallery-1.5.3/index.php 2006-03-27 17:31:25.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,v 1.78.2.2 2006/01/06 06:31:30 jenst Exp $
+ * $Id: index.php,v 1.81.2.1 2006/03/27 15:31:25 jenst Exp $
*/
?>
+
album->fields['name']}&id=$id";
?>
- ">
- user->canAddComments($gallery->album)) {
+ echo "\n". '';
+ }
+
if ($gallery->user->canWriteToAlbum($gallery->album)) {
- echo '';
+ echo "\n". '';
}
?>
diff -Naur gallery-1.5.2-pl2/layout/navmicro.inc gallery-1.5.3/layout/navmicro.inc
--- gallery-1.5.2-pl2/layout/navmicro.inc 2005-12-29 15:37:10.000000000 +0100
+++ gallery-1.5.3/layout/navmicro.inc 2006-03-27 17:31:30.000000000 +0200
@@ -1,4 +1,4 @@
-
+
$wmFile, 'text' => $wmFile);
+ if(!empty($wmName) && $wmName == $wmFile) {
+ $options[] = array('value' => $wmFile, 'text' => $wmFile, 'selected' => true);
+ }
+ else {
+ $options[] = array('value' => $wmFile, 'text' => $wmFile);
+ }
}
}
closedir($wmDir);
diff -Naur gallery-1.5.2-pl2/lib/albumItem.php gallery-1.5.3/lib/albumItem.php
--- gallery-1.5.2-pl2/lib/albumItem.php 2006-02-02 01:29:09.000000000 +0100
+++ gallery-1.5.3/lib/albumItem.php 2006-04-06 13:21:49.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: albumItem.php,v 1.14.2.4 2006/02/02 00:29:09 jenst Exp $
+ * $Id: albumItem.php,v 1.18.2.3 2006/04/06 11:21:49 jenst Exp $
*/
/**
@@ -27,10 +27,11 @@
/**
* This function shows all possible actions for an album item.
- * @param integer $i index number of the item
- * @return array Array of all possible album item for the current user.
+ * @param integer $i index number of the item
+ * @param boolean $withIcons Wether icons should be used, or not.
+ * @return array Array of all possible album item for the current user.
*/
-function getItemActions($i, $withIcons = false, $popupsOnly = false) {
+function getItemActions($i, $withIcons = false) {
global $gallery;
global $nextId;
@@ -127,13 +128,13 @@
'value' => showChoice2('edit_watermark.php', array('index' => $i))
);
}
- if(!$popupsOnly) {
- $options[] = array(
+ $options[] = array(
'pure_text' => _("ImageMap"),
'text' => getIconText('behavior-capplet.gif', _("ImageMap"), $override, $withIcons),
- 'value' => showChoice2('imagemap.php', array('index' => $i), false)
+ 'value' => showChoice2('imagemap.php', array('index' => $i), false),
+ 'attrs' => array('class' => 'url')
+
);
- }
}
$options[] = array(
@@ -202,6 +203,20 @@
'value' => showChoice2("copy_photo.php", array("index" => $i))
);
}
+
+ if ($gallery->album->isHidden($i)) {
+ $options[] = array(
+ 'pure_text' => _("Show"),
+ 'text' => getIconText('idea.gif', _("Show"), $override, $withIcons),
+ 'value' => showChoice2("do_command.php", array("cmd" => "show", "index" => $i))
+ );
+ } else {
+ $options[] = array(
+ 'pure_text' => _("Hide"),
+ 'text' => getIconText('no_idea.gif', _("Hide"), $override, $withIcons),
+ 'value' => showChoice2("do_command.php", array("cmd" => "hide", "index" => $i))
+ );
+ }
}
if ($gallery->user->canWriteToAlbum($gallery->album)) {
@@ -229,22 +244,6 @@
);
}
- if (isset($isOwner)) {
- if ($gallery->album->isHidden($i)) {
- $options[] = array(
- 'pure_text' => _("Show"),
- 'text' => getIconText('idea.gif', _("Show"), $override, $withIcons),
- 'value' => showChoice2("do_command.php", array("cmd" => "show", "index" => $i))
- );
- } else {
- $options[] = array(
- 'pure_text' => _("Hide"),
- 'text' => getIconText('no_idea.gif', _("Hide"), $override, $withIcons),
- 'value' => showChoice2("do_command.php", array("cmd" => "hide", "index" => $i))
- );
- }
- }
-
if ($gallery->user->canDeleteFromAlbum($gallery->album) ||
($gallery->album->getItemOwnerDelete() && isset($isOwner))) {
if($isAlbum) {
diff -Naur gallery-1.5.2-pl2/lib/album.php gallery-1.5.3/lib/album.php
--- gallery-1.5.2-pl2/lib/album.php 2006-01-08 21:07:18.000000000 +0100
+++ gallery-1.5.3/lib/album.php 2006-03-27 17:31:30.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: album.php,v 1.4.2.2 2006/01/08 20:07:18 jenst Exp $
+ * $Id: album.php,v 1.6.2.1 2006/03/27 15:31:30 jenst Exp $
*/
/**
diff -Naur gallery-1.5.2-pl2/lib/content.php gallery-1.5.3/lib/content.php
--- gallery-1.5.2-pl2/lib/content.php 2006-02-02 01:27:39.000000000 +0100
+++ gallery-1.5.3/lib/content.php 2006-03-27 17:31:30.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: content.php,v 1.14.2.4 2006/02/02 00:27:39 jenst Exp $
+* $Id: content.php,v 1.18.2.1 2006/03/27 15:31:30 jenst Exp $
*/
/**
diff -Naur gallery-1.5.2-pl2/lib/Form.php gallery-1.5.3/lib/Form.php
--- gallery-1.5.2-pl2/lib/Form.php 2006-01-06 07:31:36.000000000 +0100
+++ gallery-1.5.3/lib/Form.php 2006-04-06 13:21:49.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: Form.php,v 1.31.2.1 2006/01/06 06:31:36 jenst Exp $
+ * $Id: Form.php,v 1.32.2.3 2006/04/06 11:21:49 jenst Exp $
*/
?>
". $text ."" . $crlf;
@@ -145,7 +145,8 @@
if(!empty($options)) {
foreach ($options as $nr => $option) {
$sel = isset($option['selected']) ? ' selected' : '';
- $buf .= "\n\t". '' . $crlf;
+ $optAttrs = isset($option['attrs']) ? generateAttrs($option['attrs']) : '';
+ $buf .= "\n\t". "$crlf";
}
}
@@ -241,16 +242,6 @@
return $html;
}
-function showChoice($label, $target, $args, $class="") {
- global $gallery;
-
- if (empty($args['set_albumName'])) {
- $args['set_albumName'] = $gallery->session->albumName;
- }
- $args['type'] = 'popup';
- echo "\t\n";
-}
-
function showChoice2($target, $args, $popup = true) {
global $gallery;
diff -Naur gallery-1.5.2-pl2/lib/imageManipulation.php gallery-1.5.3/lib/imageManipulation.php
--- gallery-1.5.2-pl2/lib/imageManipulation.php 2006-02-02 01:39:04.000000000 +0100
+++ gallery-1.5.3/lib/imageManipulation.php 2006-03-27 17:31:30.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: imageManipulation.php,v 1.7.2.5 2006/02/02 00:39:04 jenst Exp $
+ * $Id: imageManipulation.php,v 1.12.2.1 2006/03/27 15:31:30 jenst Exp $
*/
/**
diff -Naur gallery-1.5.2-pl2/lib/lang.php gallery-1.5.3/lib/lang.php
--- gallery-1.5.2-pl2/lib/lang.php 2006-01-06 18:42:26.000000000 +0100
+++ gallery-1.5.3/lib/lang.php 2006-04-04 23:58:25.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: lang.php,v 1.66.2.3 2006/01/06 17:42:26 jenst Exp $
+ * $Id: lang.php,v 1.70.2.2 2006/04/04 21:58:25 jenst Exp $
*/
/**
@@ -319,7 +319,7 @@
switch ($ML_mode) {
case 1:
/* Static Language */
- $gallery->language = getDefaultLanguage();
+ $gallery->language = getDefaultLanguage();
break;
case 3:
@@ -334,9 +334,11 @@
$gallery->language = getDefaultLanguage();
}
break;
+
default:
/* Use Browser Language or Userlanguage when mode 2 or any other (wrong) mode*/
$gallery->browser_language = getBrowserLanguage();
+ $gallery->language = $gallery->browser_language;
if (!empty($gallery->user) && $gallery->user->getDefaultLanguage() != '') {
$gallery->language = $gallery->user->getDefaultLanguage();
diff -Naur gallery-1.5.2-pl2/lib/mail.php gallery-1.5.3/lib/mail.php
--- gallery-1.5.2-pl2/lib/mail.php 2006-01-06 07:31:37.000000000 +0100
+++ gallery-1.5.3/lib/mail.php 2006-03-27 17:31:30.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: mail.php,v 1.8.2.1 2006/01/06 06:31:37 jenst Exp $
+ * $Id: mail.php,v 1.9.2.1 2006/03/27 15:31:30 jenst Exp $
*/
/**
diff -Naur gallery-1.5.2-pl2/lib/messages.php gallery-1.5.3/lib/messages.php
--- gallery-1.5.2-pl2/lib/messages.php 2006-01-19 11:31:54.000000000 +0100
+++ gallery-1.5.3/lib/messages.php 2006-03-27 17:31:30.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: messages.php,v 1.4.2.2 2006/01/19 10:31:54 jenst Exp $
+ * $Id: messages.php,v 1.7.2.1 2006/03/27 15:31:30 jenst Exp $
*/
?>
Array";
+ //echo "\n
";
+ foreach($value as $subkey => $subvalue) {
+ //printf("\n
$gallery->session->albumName)).
- '">' ._("See full poll results") . ' ';
+ '">' .gTranslate('core', "See full poll results") . ' ';
}
echo '';
}
@@ -557,23 +560,23 @@
*/
$options = '';
for ($count=0; $count < $gallery->album->getPollScale()-2 ; $count++) {
- $options .= $nv_pairs[$count]["name"] ._(", ");
+ $options .= $nv_pairs[$count]["name"] .gTranslate('core', ", ");
}
- $options .= $nv_pairs[$count++]["name"] ._(" or ");
+ $options .= $nv_pairs[$count++]["name"] .gTranslate('core', " or ");
$options .= $nv_pairs[$count]["name"];
}
print '';
- print sprintf(_("To vote for an image, click on %s."), $options);
- print " ".sprintf(_("You MUST click on %s for your vote to be recorded."),
- ""._("Vote")."");
+ print sprintf(gTranslate('core', "To vote for an image, click on %s."), $options);
+ print " ".sprintf(gTranslate('core', "You MUST click on %s for your vote to be recorded."),
+ "".gTranslate('core', "Vote")."");
if ($gallery->album->getPollType() == "rank") {
$voteCount=$gallery->album->getPollScale();
print " ".
- sprintf(_("You have a total of %s and can change them if you wish."),
+ sprintf(gTranslate('core', "You have a total of %s and can change them if you wish."),
gTranslate('core', "1 vote", "%d votes", $voteCount));
}
else {
- print " ". _("You can change your choices if you wish.");
+ print " ". gTranslate('core', "You can change your choices if you wish.");
}
echo "";
?>
@@ -581,7 +584,7 @@
user->canAddToAlbum($gallery->album) && !$gallery->session->offline) {
$url = makeGalleryUrl('add_photos_frame.php', array('set_albumName' => $gallery->session->albumName, 'type' => 'popup'));
- echo popup_link('['. _("Hey! Add some photos.") .']', $url, 1, true, 500, 600, 'admin');
+ echo popup_link('['. gTranslate('core', "Hey! Add some photos.") .']', $url, 1, true, 500, 600, 'admin');
} else {
- echo _("This album is empty.");
+ echo gTranslate('core', "This album is empty.");
}
?>
@@ -913,13 +916,13 @@
*
-
+
- ">
+ ">
"email_me", "style" => "margin-bottom: 0px;"));
- echo _("Email me when one of the following actions are done to this album:")." ";
+ echo gTranslate('core', "Email me when one of the following actions are done to this album:")." ";
$checked_com = ($gallery->album->getEmailMe('comments', $gallery->user)) ? "checked" : "" ;
$checked_other = ($gallery->album->getEmailMe('other', $gallery->user)) ? "checked" : "";
?>