diff -Naur gallery-1.5-pl1/add_comment.php gallery-1.5.1/add_comment.php --- gallery-1.5-pl1/add_comment.php 2005-03-10 03:29:33.000000000 +0100 +++ gallery-1.5.1/add_comment.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: add_comment.php,v 1.47.2.1 2005/03/10 02:29:33 cryptographite Exp $ + * $Id: add_comment.php,v 1.49.2.2 2005/09/12 22:40:44 dmolavi Exp $ */ ?> user->canAddComments($gallery->album)) { echo _("You are not allowed to perform this action!"); - exit; + exit; } list($save, $id, $commenter_name, $comment_text) = getRequestVar(array('save', 'id', 'commenter_name', 'comment_text')); -$error_text = ""; +$error_text = ''; if ($gallery->user->isLoggedIn() ) { if (empty($commenter_name) || $gallery->app->comments_anonymous == 'no') { - $commenter_name=user_name_string($gallery->user->getUID(), - $gallery->app->comments_display_name); + $commenter_name=user_name_string($gallery->user->getUID(), + $gallery->app->comments_display_name); } } elseif (!isset($commenter_name)) { - $commenter_name=''; + $commenter_name = ''; } if (empty($comment_text)) { - $comment_text=''; + $comment_text = ''; } if (isset($gallery->app->comments_length)) { - $maxlength=$gallery->app->comments_length; + $maxlength = $gallery->app->comments_length; } else { - $maxlength=0; + $maxlength = 0; } if (isset($save)) { - if ( empty($commenter_name) || empty($comment_text)) { - $error_text = _("Name and comment are both required to save a new comment!"); + if ( empty($commenter_name) || empty($comment_text)) { + $error_text = _("Name and comment are both required to save a new comment!"); } elseif ($maxlength >0 && strlen($comment_text) > $maxlength) { $error_text = sprintf(_("Your comment is too long, the admin set maximum length to %d chars"), $maxlength); } elseif (isBlacklistedComment($tmp = array('commenter_name' => $commenter_name, 'comment_text' => $comment_text), false)) { @@ -64,13 +63,15 @@ $comment_text = removeTags($comment_text); $commenter_name = removeTags($commenter_name); $IPNumber = $_SERVER['REMOTE_ADDR']; - $gallery->album->addComment($id, stripslashes($comment_text), $IPNumber, $commenter_name); + $gallery->album->addComment($id, $comment_text, $IPNumber, $commenter_name); + $gallery->album->save(); emailComments($id, $comment_text, $commenter_name); + // Note: In stats.php this causes the browser to show a message about POST data ... dismissAndReload(); return; - } + } } doctype(); ?> @@ -85,17 +86,14 @@

album->getThumbnailTagById($id); +echo $gallery->album->getThumbnailTagById($id); if (!empty($error_text)) { echo "\n
". gallery_error($error_text); } echo "

"; - - - -echo makeFormIntro("add_comment.php", +echo makeFormIntro("add_comment.php", array("name" => "theform", "method" => "POST"), - array('type' => 'popup')); + array('type' => 'popup')); drawCommentAddForm($commenter_name, 35); ?> @@ -105,7 +103,7 @@ + + + + +
+
+ +album->getThumbnailTag($photoIndex); + if (!empty($error_msg)) { + echo '

'. gallery_error($error_msg) .'

'; + } + + echo makeFormIntro("ecard_form.php", + array("name" => "ecard_form", "method" => "POST"), + array("type" => "popup")); +?> + "> + + + + +
+ + + + + + + + + user) && $gallery->user->isLoggedIn()) { + $defaultSenderName = $gallery->user->displayName(); + $defaultSenderEmail = $gallery->user->getEmail(); + } + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
+ + + helpIcon +
+ +
 
+ +
+ + + + + + + + +
">"> ">">
+
+ + +

album->getThumbnailTag($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-pl1/ecard_preview.php gallery-1.5.1/ecard_preview.php --- gallery-1.5-pl1/ecard_preview.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/ecard_preview.php 2005-09-13 00:40:44.000000000 +0200 @@ -0,0 +1,48 @@ + + + diff -Naur gallery-1.5-pl1/edit_appearance.php gallery-1.5.1/edit_appearance.php --- gallery-1.5-pl1/edit_appearance.php 2005-04-14 03:48:23.000000000 +0200 +++ gallery-1.5.1/edit_appearance.php 2005-09-13 00:40:44.000000000 +0200 @@ -2,22 +2,22 @@ /* * Gallery - a web based photo album viewer and editor * Copyright (C) 2000-2005 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: edit_appearance.php,v 1.95.2.2 2005/04/14 01:48:23 cryptographite Exp $ + * $Id: edit_appearance.php,v 1.108.2.3 2005/09/12 22:40:44 dmolavi Exp $ */ ?> user->canWriteToAlbum($gallery->album)) { - echo _("You are not allowed to perform this action!"); - exit; + echo _("You are not allowed to perform this action!"); + exit; } - + +list($nv_pairs, $extra_fields, $num_user_fields) = + getRequestVar(array('nv_pairs','extra_fields', 'num_user_fields')); + +include_once (dirname(__FILE__) . '/includes/definitions/services.php'); +include_once (dirname(__FILE__) . '/lib/setup.php'); +include_once (dirname(__FILE__) . '/js/sectionTabs.js.php'); + +$infoMessages = array(); +$reloadOpener = false; + if (getRequestVar('save')) { - foreach ($gallery->album->fields as $key => $name) { - ${$key} = getRequestVar($key); - } - if (get_magic_quotes_gpc()) { - $gallery->album->fields["summary"] = stripslashes($summary); - $gallery->album->fields["title"] = stripslashes($title); - } else { - $gallery->album->fields["summary"] = $summary; - $gallery->album->fields["title"] = $title; - } - $gallery->album->fields["bgcolor"] = $bgcolor; - $gallery->album->fields["textcolor"] = $textcolor; - $gallery->album->fields["linkcolor"] = $linkcolor; - $gallery->album->fields["font"] = $font; - $gallery->album->fields["bordercolor"] = $bordercolor; - $gallery->album->fields["border"] = $border; - $gallery->album->fields["background"] = $background; - $gallery->album->fields["thumb_size"] = $thumb_size; - $gallery->album->fields["resize_size"] = $resize_size; - $gallery->album->fields["resize_file_size"] = $resize_file_size; - $gallery->album->fields['max_size'] = $max_size; - $gallery->album->fields['max_file_size'] = $max_file_size; - $gallery->album->fields["returnto"] = $returnto; - $gallery->album->fields["rows"] = $rows; - $gallery->album->fields["cols"] = $cols; - $gallery->album->fields["fit_to_window"] = $fit_to_window; - $gallery->album->fields["use_fullOnly"] = $use_fullOnly; - $gallery->album->fields["print_photos"] = empty($print_photos) ? "" : $print_photos; - $gallery->album->fields["use_exif"] = $use_exif; - $gallery->album->fields["display_clicks"] = $display_clicks; - $gallery->album->fields["item_owner_modify"] = $item_owner_modify; - $gallery->album->fields["item_owner_delete"] = $item_owner_delete; - $gallery->album->fields["item_owner_display"] = $item_owner_display; - $gallery->album->fields["add_to_beginning"] = $add_to_beginning; - $gallery->album->fields["slideshow_type"] = $slideshow_type; - $gallery->album->fields["slideshow_recursive"] = $slideshow_recursive; - $gallery->album->fields["slideshow_loop"] = $slideshow_loop; - $gallery->album->fields["slideshow_length"] = $slideshow_length; - $gallery->album->fields["album_frame"] = $album_frame; - $gallery->album->fields["thumb_frame"] = $thumb_frame; - $gallery->album->fields["image_frame"] = $image_frame; - $gallery->album->fields["showDimensions"] = $showDimensions; - $gallery->album->save(array(i18n("Properties changed"))); - - if (getRequestVar('setNested')) { - $gallery->album->setNestedProperties(); - } + /** + * This part does 2 things: + * 1.) get the values given by user, so we can put them into the album later. + * 2.) Load the properties and check wether a user input is invalid. + */ + + include (dirname(__FILE__) . '/includes/definitions/albumProperties.php'); + foreach ($gallery->album->fields as $fieldName => $values) { + ${$fieldName} = getRequestVar($fieldName); + if (isset($properties[$fieldName]['vartype'])) { + 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); + } + } + } + + $gallery->album->fields["summary"] = $summary; + $gallery->album->fields["title"] = $title; + $gallery->album->fields["bgcolor"] = $bgcolor; + $gallery->album->fields["textcolor"] = $textcolor; + $gallery->album->fields["linkcolor"] = $linkcolor; + $gallery->album->fields["font"] = $font; + $gallery->album->fields["bordercolor"] = $bordercolor; + $gallery->album->fields["border"] = $border; + $gallery->album->fields["background"] = $background; + $gallery->album->fields["thumb_size"] = $thumb_size; + $gallery->album->fields["resize_size"] = $resize_size; + $gallery->album->fields["resize_file_size"] = $resize_file_size; + $gallery->album->fields['max_size'] = $max_size; + $gallery->album->fields['max_file_size'] = $max_file_size; + $gallery->album->fields["returnto"] = $returnto; + $gallery->album->fields["rows"] = $rows; + $gallery->album->fields["cols"] = $cols; + $gallery->album->fields["fit_to_window"] = $fit_to_window; + $gallery->album->fields["use_fullOnly"] = $use_fullOnly; + $gallery->album->fields["print_photos"] = $print_photos; + $gallery->album->fields["use_exif"] = $use_exif; + $gallery->album->fields["display_clicks"] = $display_clicks; + $gallery->album->fields["item_owner_modify"] = $item_owner_modify; + $gallery->album->fields["item_owner_delete"] = $item_owner_delete; + $gallery->album->fields["item_owner_display"] = $item_owner_display; + $gallery->album->fields["add_to_beginning"] = $add_to_beginning; + $gallery->album->fields["slideshow_type"] = $slideshow_type; + $gallery->album->fields["slideshow_recursive"] = $slideshow_recursive; + $gallery->album->fields["slideshow_loop"] = $slideshow_loop; + $gallery->album->fields["slideshow_length"] = $slideshow_length; + $gallery->album->fields["album_frame"] = $album_frame; + $gallery->album->fields["thumb_frame"] = $thumb_frame; + $gallery->album->fields["image_frame"] = $image_frame; + $gallery->album->fields["showDimensions"] = $showDimensions; + $gallery->album->fields["ecards"] = $ecards; + + $gallery->album->fields["nav_thumbs"] = $nav_thumbs; + $gallery->album->fields["nav_thumbs_style"] = $nav_thumbs_style; + $gallery->album->fields["nav_thumbs_first_last"] = $nav_thumbs_first_last; + $gallery->album->fields["nav_thumbs_prev_shown"] = $nav_thumbs_prev_shown; + $gallery->album->fields["nav_thumbs_next_shown"] = $nav_thumbs_next_shown; + $gallery->album->fields["nav_thumbs_location"] = $nav_thumbs_location; + $gallery->album->fields["nav_thumbs_size"] = $nav_thumbs_size; + $gallery->album->fields["nav_thumbs_current_bonus"] = $nav_thumbs_current_bonus; + + /* Poll properties */ + for ($i = 0; $i < $gallery->album->getPollScale() ; $i++) { + //convert values to numbers + $nv_pairs[$i]["value"]=0+$nv_pairs[$i]["value"]; + } + $gallery->album->fields["poll_nv_pairs"]=$nv_pairs; + $gallery->album->fields["poll_hint"]=$poll_hint; + $gallery->album->fields["poll_type"] = $poll_type; + if ($voter_class == "Logged in" && + $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") .""); + } + $gallery->album->fields["voter_class"] = $voter_class; + $gallery->album->fields["poll_scale"] = $poll_scale; + $gallery->album->fields["poll_show_results"] = $poll_show_results; + $gallery->album->fields["poll_num_results"] = $poll_num_results; + $gallery->album->fields["poll_orientation"] = $poll_orientation; + + + /* Extrafields and Custom Fields */ + $count = 0; + if (!isset($extra_fields)) { + $extra_fields = array(); + } + + for ($i = 0; $i < sizeof($extra_fields); $i++) { + $extra_fields[$i] = str_replace('"', '"', $extra_fields[$i]); + } + + $num_fields = $num_user_fields+num_special_fields($extra_fields); - reload(); + $gallery->album->setExtraFields($extra_fields); + + if ($num_fields > 0 && !$gallery->album->getExtraFields()) { + $gallery->album->setExtraFields(array()); + } + + if (sizeof ($gallery->album->getExtraFields()) < $num_fields) { + $gallery->album->setExtraFields(array_pad($gallery->album->getExtraFields(), $num_fields, _("untitled field"))); + } + + if (sizeof ($gallery->album->getExtraFields()) > $num_fields) { + $gallery->album->setExtraFields(array_slice($gallery->album->getExtraFields(), 0, $num_fields)); + } + + $gallery->album->save(array(i18n("Properties changed"))); + + if (getRequestVar('setNested')) { + $gallery->album->setNestedProperties(); + } + + $reloadOpener = true; +} + + +/* Custom / Extra Fields */ +function num_special_fields($extra_fields) { + $num_special_fields = 0; + foreach (array_keys(automaticFieldsList()) as $special_field) { + if (in_array($special_field, $extra_fields)) { + $num_special_fields++; + } + } + + foreach (array("Title", "AltText") as $named_field) { + if (in_array($named_field, $extra_fields)) { + $num_special_fields++; + } + } + + return $num_special_fields; } +$multiple_choices_EF = array( + 'Title' => _("Title"), + 'AltText' => _("Alt Text / onMouseOver") +); + +$extra_fields = $gallery->album->getExtraFields(); +$checked_EF = array(); + +foreach (automaticFieldsList() as $automatic => $printable_automatic) { + if ($automatic === "EXIF" && (($gallery->album->fields["use_exif"] != "yes") || !$gallery->app->use_exif)) { + continue; + } + $multiple_choices_EF[$automatic] = $printable_automatic; +} + +foreach($multiple_choices_EF as $field => $trash) { + if (in_array($field, $extra_fields)) { + $checked_EF[] = $field; + } +} + +$num_user_fields = sizeof($extra_fields) - num_special_fields($extra_fields); + +$customFields = array(); +$i = 1; +foreach ($extra_fields as $value) { + if (in_array($value, array_keys(automaticFieldsList())) || !strcmp($value, "Title") || !strcmp($value, "AltText")) { + continue; + } + + $customFields["cf_$i"] = array( + 'name' => 'extra_fields[]', + 'prompt' => sprintf(_("Field %s:"),$i), + 'desc' => '', + 'type' => 'text', + 'value' => $value + ); + $i++; +} +/* We may load the properties now the second time, but its needed as they might have change above. */ +include (dirname(__FILE__) . '/includes/definitions/albumProperties.php'); +$initialtab = getRequestVar('initialtab'); + doctype(); ?> @@ -91,257 +233,65 @@ +
+
- "theform", "method" => "POST"), - array("type" => "popup")); -?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -app->use_exif) { -?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
">
">
">
">
(URL)">
">
- -
">
">
- -
">
- -
Return to link") ?> - -
- -
- -
images without a resized copy") ?> - -
preference for full-size or resized images") ?> - -
do you want to let visitors use?") ?> - array( - 'name' => 'PhotoWorks', - 'url' => 'http://www.photoworks.com/'), - 'shutterfly' => array( - 'name' => 'Shutterfly', - 'url' => 'http://www.shutterfly.com/', - ), - 'fotoserve' => array( - 'name' => 'Fotoserve.com', - 'url' => 'http://www.fotoserve.com/', - ), - 'fotokasten' => array( - 'name' => 'Fotokasten', - 'url' => 'http://www.fotokasten.de/'), - 'mpush' => array( - 'name' => 'mPUSH', - 'url' => 'http://www.mpush.cc/'), -); -foreach ($services as $item => $data) { - if (isset($gallery->album->fields['print_photos'][$item])) { - $value = $gallery->album->fields['print_photos'][$item]; - } else { - $value = array('checked' => false); - } - $checked = !empty($value['checked']) ? ' checked' : ''; - print "\t${data['name']}
\n"; + "theform", "method" => "POST"), + array("type" => "popup")); + +$i = 0; +makeSectionTabs($properties,5, $initialtab); + +foreach ($properties as $key => $val) { + if(!empty($val['skip'])) { + continue; + } + + if (isset($val["type"]) && ($val["type"] === 'group_start' )) { + if ($val['name'] == $initialtab || (empty($initialtab) && $val['default'] == 'inline')) { + $display = 'inline'; + } else { + $display = 'none'; + } + echo "\n
"; + echo make_separator($key, $val); + echo "\n"; + continue; + } + + if (isset($val["type"]) && ($val["type"] === 'subgroup' )) { + echo ''; + continue; + } + + if (isset($val["type"]) && ($val["type"] === 'group_end' )) { + echo "\n
'. make_separator($key, $val) .'
"; + echo "\n
"; + continue; + } + + // Protect quote characters to avoid screwing up HTML forms + $val["value"] = array_str_replace('"', """, $val["value"]); + + if (isset($val["type"]) && !strcmp($val["type"], "hidden")) { + list($f1, $f2) = make_fields($key, $val); + echo $f2; + } else { + echo evenOdd_row(make_fields($key, $val), + $i++ % 2); + } + + $onThisPage[$key] = 1; + $preserve[$key] = 1; } ?> -
- -
- -
- -
">
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
+ + +


@@ -351,12 +301,6 @@ -
diff -Naur gallery-1.5-pl1/edit_caption.php gallery-1.5.1/edit_caption.php --- gallery-1.5-pl1/edit_caption.php 2005-03-10 03:29:34.000000000 +0100 +++ gallery-1.5.1/edit_caption.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: edit_caption.php,v 1.61.2.1 2005/03/10 02:29:34 cryptographite Exp $ + * $Id: edit_caption.php,v 1.64.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> "; if (isset($save)) { - // Only allow dates which mktime() will operate on. - // 1970-2037 (Windows and some UNIXes) -- 1970-2069 (Some UNIXes) - // Two digit values between 0-69 mapping to 2000-2069 and 70-99 to 1970-1999 - if ((($capture_year < 2070) && ($capture_year > 1969)) || ($capture_year < 100)) { - $gallery->album->setCaption($index, stripslashes($data)); - $gallery->album->setKeywords($index, stripslashes($keywords)); - $dateArray["year"] = $capture_year; - $dateArray["mon"] = $capture_mon; - $dateArray["mday"] = $capture_mday; - $dateArray["hours"] = $capture_hours; - $dateArray["minutes"] = $capture_minutes; - $dateArray["seconds"] = $capture_seconds; - - $timestamp=mktime($capture_hours, $capture_minutes, $capture_seconds, $capture_mon, $capture_mday, $capture_year); - $gallery->album->setItemCaptureDate($index, $timestamp); - if (isset($extra_fields)) { - foreach ($extra_fields as $field => $value) - { - if (get_magic_quotes_gpc()) { - $value=stripslashes($value); - } - $gallery->album->setExtraField($index, $field, trim($value)); - } - } - $gallery->album->save(array(i18n("Captions and/or custom fields modified for %s"), - makeAlbumURL($gallery->album->fields["name"], $gallery->album->getPhotoId($index)))); - dismissAndReload(); - if (!isDebugging()) { - return; - } - } else { - $err = _("Year must be between 1000 and 3000"); + // Only allow dates which mktime() will operate on. + // 1970-2037 (Windows and some UNIXes) -- 1970-2069 (Some UNIXes) + // Two digit values between 0-69 mapping to 2000-2069 and 70-99 to 1970-1999 + if ((($capture_year < 2070) && ($capture_year > 1969)) || ($capture_year < 100)) { + $gallery->album->setCaption($index, $data); + $gallery->album->setKeywords($index, $keywords); + $dateArray["year"] = $capture_year; + $dateArray["mon"] = $capture_mon; + $dateArray["mday"] = $capture_mday; + $dateArray["hours"] = $capture_hours; + $dateArray["minutes"] = $capture_minutes; + $dateArray["seconds"] = $capture_seconds; + + $timestamp = mktime($capture_hours, $capture_minutes, $capture_seconds, $capture_mon, $capture_mday, $capture_year); + $gallery->album->setItemCaptureDate($index, $timestamp); + if (isset($extra_fields)) { + foreach ($extra_fields as $field => $value){ + $gallery->album->setExtraField($index, $field, trim($value)); + } + } + $gallery->album->save(array(i18n("Captions and/or custom fields modified for %s"), + makeAlbumURL($gallery->album->fields["name"], $gallery->album->getPhotoId($index)))); + dismissAndReload(); + if (!isDebugging()) { + return; } + } else { + $err = _("Year must be between 1969 and 2070"); + } } ?> @@ -127,8 +123,8 @@ ". gallery_error($error_text) . "

"; +if (!empty($err)) { + echo "\n

". gallery_error($err) . "

"; } $itemCaptureDate = $gallery->album->getItemCaptureDate($index); diff -Naur gallery-1.5-pl1/edit_field.php gallery-1.5.1/edit_field.php --- gallery-1.5-pl1/edit_field.php 2005-03-10 03:29:34.000000000 +0100 +++ gallery-1.5.1/edit_field.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: edit_field.php,v 1.43.2.1 2005/03/10 02:29:34 cryptographite Exp $ + * $Id: edit_field.php,v 1.45.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> "; if (isset($save)) { - if (!strcmp($field, 'title')) { - $data = removeTags($data); - } - $gallery->album->fields[$field] = stripslashes($data); - $gallery->album->save(array(i18n("%s modified"), $field)); - dismissAndReload(); - return; + if (!strcmp($field, 'title')) { + $data = removeTags($data); + } + $gallery->album->fields[$field] = $data; + $gallery->album->save(array(i18n("%s modified"), $field)); + dismissAndReload(); + return; } ?> diff -Naur gallery-1.5-pl1/edit_thumb.php gallery-1.5.1/edit_thumb.php --- gallery-1.5-pl1/edit_thumb.php 2005-03-10 03:29:34.000000000 +0100 +++ gallery-1.5.1/edit_thumb.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: edit_thumb.php,v 1.42.2.1 2005/03/10 02:29:34 cryptographite Exp $ + * $Id: edit_thumb.php,v 1.43.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> user->canChangeTextOfAlbum($gallery->album)) { - echo _("You are not allowed to perform this action!"); - exit; + echo _("You are not allowed to perform this action!"); + exit; } list($index, $save, $preview, $previewFull) = getRequestVar(array('index', 'save', 'preview', 'previewFull')); list($wmName, $wmAlign, $wmAlignX, $wmAlignY) = getRequestVar(array('wmName', 'wmAlign', 'wmAlignX', 'wmAlignY')); list($wmSelect) = getRequestVar(array('wmSelect')); -$err = ""; +$photo = $gallery->album->getPhoto($index); +$err = ''; + if (isset($save) || isset($preview)) { - if (isset($wmAlign) && ($wmAlign > 0) && ($wmAlign < 12)) - { - if (isset($wmName) && !empty($wmName)) { - - if (isset($save)) { - echo "
". _("Watermarking photo.")."
(". _("this may take a while"). ")
\n"; - my_flush(); - set_time_limit($gallery->app->timeLimit); - $gallery->album->watermarkPhoto($index, $wmName, "", $wmAlign, - isset($wmAlignX) ? $wmAlignX : 0, - isset($wmAlignY) ? $wmAlignY : 0, - 0, 0, // Not a preview - isset($wmSelect) ? $wmSelect : 0); - $gallery->album->save(); - dismissAndReload(); - return; - } - else - { - $gallery->album->watermarkPhoto($index, $wmName, "", $wmAlign, - isset($wmAlignX) ? $wmAlignX : 0, - isset($wmAlignY) ? $wmAlignY : 0, - 1, // set as preview - isset($previewFull) ? $previewFull : 0); - } - } else { - $err = _("Please select a watermark."); - } + if (isset($wmAlign) && ($wmAlign > 0) && ($wmAlign < 12)) { + if (isset($wmName) && !empty($wmName)) { + if (isset($save)) { + my_flush(); + set_time_limit($gallery->app->timeLimit); + $gallery->album->watermarkPhoto($index, $wmName, "", $wmAlign, + isset($wmAlignX) ? $wmAlignX : 0, + isset($wmAlignY) ? $wmAlignY : 0, + 0, 0, // Not a preview + isset($wmSelect) ? $wmSelect : 0); + dismissAndReload(); + return; + } + else { + $gallery->album->watermarkPhoto($index, $wmName, "", + $wmAlign, + isset($wmAlignX) ? $wmAlignX : 0, + isset($wmAlignY) ? $wmAlignY : 0, + 1, // set as preview + isset($previewFull) ? $previewFull : 0); + } } else { - $err = _("Please select an alignment."); + $err = _("Please select a watermark."); } + } else { + $err = _("Please select an alignment."); + } } doctype(); + ?> @@ -81,21 +90,23 @@

album->getPreviewTag($index); + echo $gallery->album->getPreviewTag($index); } else { - echo $gallery->album->getThumbnailTag($index); + echo $gallery->album->getThumbnailTag($index); } ?>

'. $err . '

'; + echo '

'. $err . '

'; +} + +if ($photo->image->type == 'gif') { + echo infoLine(_("Your image is a gif. Watermarking on animated gifs is currently not supported and will 'deface & unanimate' your picture."), 'notice'); } -echo makeFormIntro("edit_watermark.php", - array("name" => "theform", - "method" => "POST")); +echo makeFormIntro("edit_watermark.php", array("name" => "theform", "method" => "POST")); global $watermarkForm; $watermarkForm["askRecursive"] = 0; $watermarkForm["askPreview"] = 1; @@ -109,15 +120,17 @@ " onclick='parent.close()'>

- - + $index, 'set_albumName' => $gallery->album->fields["name"])); +?> diff -Naur gallery-1.5-pl1/errors/configure_help.php gallery-1.5.1/errors/configure_help.php --- gallery-1.5-pl1/errors/configure_help.php 2004-06-09 13:35:48.000000000 +0200 +++ gallery-1.5.1/errors/configure_help.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ - -', '') ?> diff -Naur gallery-1.5-pl1/errors/reconfigure.php gallery-1.5.1/errors/reconfigure.php --- gallery-1.5-pl1/errors/reconfigure.php 2004-06-07 09:24:26.000000000 +0200 +++ gallery-1.5.1/errors/reconfigure.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ - - - - - <?php echo _("Gallery needs Reconfiguration") ?> - - - - -
-

- -

- -

- -

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

-
- - diff -Naur gallery-1.5-pl1/errors/unconfigured.php gallery-1.5.1/errors/unconfigured.php --- gallery-1.5-pl1/errors/unconfigured.php 2004-06-07 18:52:29.000000000 +0200 +++ gallery-1.5.1/errors/unconfigured.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ - - - - - <?php echo _("Gallery Configuration Error") ?> - - - - -
-

- -

- -

- - - - - - - - - - - -
- -

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

-
- - diff -Naur gallery-1.5-pl1/extra_fields.php gallery-1.5.1/extra_fields.php --- gallery-1.5-pl1/extra_fields.php 2005-03-10 03:29:34.000000000 +0100 +++ gallery-1.5.1/extra_fields.php 2005-09-13 00:40:44.000000000 +0200 @@ -17,16 +17,17 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: extra_fields.php,v 1.29.2.1 2005/03/10 02:29:34 cryptographite Exp $ + * $Id: extra_fields.php,v 1.32.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> user->canWriteToAlbum($gallery->album)) { @@ -41,9 +42,6 @@ } for ($i = 0; $i < sizeof($extra_fields); $i++) { - if (get_magic_quotes_gpc()) { - $extra_fields[$i] = stripslashes($extra_fields[$i]); - } $extra_fields[$i] = str_replace('"', '"', $extra_fields[$i]); } diff -Naur gallery-1.5-pl1/gallery_remote2.php gallery-1.5.1/gallery_remote2.php --- gallery-1.5-pl1/gallery_remote2.php 2005-04-14 03:48:23.000000000 +0200 +++ gallery-1.5.1/gallery_remote2.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: gallery_remote2.php,v 1.70.2.2 2005/04/14 01:48:23 cryptographite Exp $ + * $Id: gallery_remote2.php,v 1.75.2.2 2005/09/12 22:40:44 dmolavi Exp $ */ ?> app->debug == "no") { +//if(!isDebugging()) { // @ob_start(); //} @@ -82,8 +81,6 @@ $GR_STAT['ROTATE_IMAGE_FAILED'] = 504; - - $response = new Properties(); $protocol_version = getRequestVar('protocol_version'); check_proto_version( $response ); @@ -142,7 +139,7 @@ -function gr_login( &$gallery, &$response, &$uname, &$password ) { +function gr_login( &$gallery, &$response, $uname, $password ) { global $GR_STAT, $GR_VER; if (!$uname | !$password) { @@ -241,7 +238,7 @@ } -function gr_add_item( &$gallery, &$response, &$userfile, &$userfile_name, &$caption, &$force_filename, &$auto_rotate ) { +function gr_add_item( &$gallery, &$response, &$userfile, &$userfile_name, $caption, $force_filename, $auto_rotate ) { global $GR_STAT, $temp_files; @@ -336,9 +333,6 @@ global $GR_STAT; $resize_dimension = $gallery->album->fields['resize_size']; - if ($resize_dimension == 'off') { - $resize_dimension = 0; - } $response->setProperty( 'auto_resize', $resize_dimension ); @@ -361,16 +355,10 @@ } -function gr_new_album( &$gallery, &$response, &$newAlbumName, &$newAlbumTitle, &$newAlbumDesc ) { +function gr_new_album( &$gallery, &$response, $newAlbumName, $newAlbumTitle, $newAlbumDesc ) { global $GR_STAT; - if(get_magic_quotes_gpc()) { - $newAlbumName = stripslashes($newAlbumName); - $newAlbumTitle = stripslashes($newAlbumTitle); - $newAlbumDesc = stripslashes($newAlbumDesc); - } - if(isset($gallery->album) && isset($gallery->album->fields["name"])) { $canAddAlbum = $gallery->user->canCreateSubAlbum($gallery->album); } else { @@ -452,7 +440,7 @@ $response->setProperty( 'image.capturedate.hours.'.$tmpImageNum, $albumItemObj->itemCaptureDate['hours'] ); $response->setProperty( 'image.capturedate.minutes.'.$tmpImageNum, $albumItemObj->itemCaptureDate['minutes'] ); $response->setProperty( 'image.capturedate.seconds.'.$tmpImageNum, $albumItemObj->itemCaptureDate['seconds'] ); - $response->setProperty( 'image.hidden.'.$tmpImageNum, $albumItemObj->isHidden()?"yes":"no" ); + $response->setProperty( 'image.hidden.'.$tmpImageNum, $albumItemObj->isHidden()? "yes":"no" ); } else { if ($albums_too) { if (! isset($albumDB)) { @@ -465,7 +453,7 @@ $tmpImageNum++; $response->setProperty( 'album.name.'.$tmpImageNum, $albumItemObj->getAlbumName() ); - $response->setProperty( 'album.hidden.'.$tmpImageNum, $myAlbum->isHiddenRecurse()?'yes':'no' ); + $response->setProperty( 'album.hidden.'.$tmpImageNum, $myAlbum->isHiddenRecurse() ? 'yes':'no' ); } } } @@ -665,8 +653,6 @@ } */ - - function check_proto_version( &$response ) { global $protocol_version, $GR_STAT, $GR_VER; @@ -767,8 +753,8 @@ $response->setProperty( "album.title.$album_index", $albumTitle ); $response->setProperty( "album.summary.$album_index", $myAlbum->fields['summary'] ); $response->setProperty( "album.parent.$album_index", $parent_index ); - $response->setProperty( "album.resize_size.$album_index", $myAlbum->fields['resize_size'] == 'off' ? 0 : $myAlbum->fields['resize_size'] ); - $response->setProperty( "album.max_size.$album_index", $myAlbum->fields['max_size'] == 'off' ? 0 : $myAlbum->fields['max_size'] ); + $response->setProperty( "album.resize_size.$album_index", $myAlbum->fields['resize_size'] ); + $response->setProperty( "album.max_size.$album_index", $myAlbum->fields['max_size'] ); $response->setProperty( "album.thumb_size.$album_index", $myAlbum->fields['thumb_size'] ); // write permissions @@ -837,9 +823,7 @@ } else { // remove %20 and the like from name $name = urldecode($name); - if (get_magic_quotes_gpc()) { - $name = stripslashes($name); - } + // parse out original filename without extension $originalFilename = eregi_replace(".$tag$", "", $name); // replace multiple non-word characters with a single "_" @@ -880,9 +864,6 @@ } if ($setCaption) { - if (get_magic_quotes_gpc()) { - $setCaption = stripslashes($setCaption); - } $caption = $setCaption; } else { $caption = ""; @@ -895,23 +876,17 @@ //echo "Looking for extra field $fieldname\n"; // The way it should be done now - $value = isset($_POST[("extrafield.".$field)]) ? $_POST[("extrafield.".$field)] : ''; + $value = getRequestVar("extrafield.".$field); //echo "Got extra field $field = $value\n"; - if ($value) { - if (get_magic_quotes_gpc()) { - $value = stripslashes($value); - } + if (!empty($value)) { //echo "Setting field $field\n"; $myExtraFields[$field] = $value; } // Deprecated - $value = isset($_POST[("extrafield_".$field)]) ? $_POST[("extrafield_".$field)] : ''; + $value = getRequestVar("extrafield_".$field); //echo "Got extra field $field = $value\n"; - if ($value) { - if (get_magic_quotes_gpc()) { - $value = stripslashes($value); - } + if (!empty($value)) { //echo "Setting field $field\n"; $myExtraFields[$field] = $value; } diff -Naur gallery-1.5-pl1/gallery_remote.php gallery-1.5.1/gallery_remote.php --- gallery-1.5-pl1/gallery_remote.php 2005-03-10 03:29:34.000000000 +0100 +++ gallery-1.5.1/gallery_remote.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: gallery_remote.php,v 1.25.2.1 2005/03/10 02:29:34 cryptographite Exp $ + * $Id: gallery_remote.php,v 1.26.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> -

+ _("yes"), 0 => _("no")); ?> -

- @@ -38,24 +38,26 @@ + +if (isset($allowChange["password"]) && $allowChange["password"] === true) { + if (isset($allowChange["old_password"]) && $allowChange["old_password"] === true) { ?> - +?> - + - @@ -101,39 +103,51 @@ $hidden[]=array('defaultLanguage', $gallery->app->default_language); } } + +if (isset($allowChange["canChangeOwnPw"]) && $allowChange["canChangeOwnPw"] === true) { ?> + + + + + - + + +user->isAdmin()) { ?> + + + user->getUsername() == $uname) { + echo ''; + echo ''; + $hidden[]=array('isAdmin', $isAdmin); + } else { + echo ''; + echo 'app->emailOn == "yes") { ?> + +if ($allowChange["send_email"] === true && $gallery->app->emailOn == "yes") { ?> - + user->isAdmin() && isset($isAdmin)) { ?> - - - - - +?>
'. $yesNoChoices[$isAdmin] .'
('. _("you can't un-admin yourself") . ')'. drawSelect("isAdmin", $yesNoChoices, $isAdmin, 1) . '
('. _("Note: Admins can always create albums and are allowed to change their password.") .')'; + } + } ?>
when account is created") ?>
user->getUsername() == $uname) { - echo $isAdminChoices[$isAdmin] . ' ( '. _("you can't un-admin yourself") . ')'; - } else { - echo drawSelect("isAdmin", $isAdminChoices, $isAdmin, 1); - echo '
'; - echo '('. _("Note: admins can always create albums") . ')'; - } - } ?>
session->offline && (!isset($gallery->app->rssEnabled) || $gallery->app->rssEnabled == "yes")) { ?> - RSS + RSS user->isAdmin() ) { ?> diff -Naur gallery-1.5-pl1/html_wrap/album.header.default gallery-1.5.1/html_wrap/album.header.default --- gallery-1.5-pl1/html_wrap/album.header.default 2004-07-17 13:35:20.000000000 +0200 +++ gallery-1.5.1/html_wrap/album.header.default 2005-08-16 00:56:27.000000000 +0200 @@ -12,14 +12,14 @@ // - Gallery Title: $gallery->app->galleryTitle // - Album Title: $gallery->album->fields["title"] // -// $Id: album.header.default,v 1.17 2004/07/17 11:35:20 jenst Exp $ +// $Id: album.header.default,v 1.18.2.1 2005/08/15 22:56:27 jenst Exp $ ?> - +
diff -Naur gallery-1.5-pl1/html_wrap/frames/postage_stamp/BB5.gif gallery-1.5.1/html_wrap/frames/postage_stamp/BB5.gif --- gallery-1.5-pl1/html_wrap/frames/postage_stamp/BB5.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/html_wrap/frames/postage_stamp/BB5.gif 2005-08-08 22:22:54.000000000 +0200 @@ -0,0 +1,5 @@ +GIF89a + +÷#ÿÿÿþþþûûûùùùøøøôôôòòòñññïïïîîîçççæææäääßßßÛÛÛËËËÊÊÊ¿¿¿²²²©©©   žžž———‡‡‡ƒƒƒ~~~rrrkkkfffdddcccbbb```!ù#, + +EH° ÁƒXX@ÀÀ4Pá€Ã(dÐ`a\ð0bˆÀ¡dÉ ˜ÐÁeI8EØ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/html_wrap/frames/postage_stamp/BL5.gif gallery-1.5.1/html_wrap/frames/postage_stamp/BL5.gif --- gallery-1.5-pl1/html_wrap/frames/postage_stamp/BL5.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/html_wrap/frames/postage_stamp/BL5.gif 2005-08-08 22:22:55.000000000 +0200 @@ -0,0 +1,5 @@ +GIF89a + +‘fff```ÿÿÿÿÿÿ!ù, + +Ü"©b¸Ù<’Qñ}„ÆH–f; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/html_wrap/frames/postage_stamp/BR5.gif gallery-1.5.1/html_wrap/frames/postage_stamp/BR5.gif --- gallery-1.5-pl1/html_wrap/frames/postage_stamp/BR5.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/html_wrap/frames/postage_stamp/BR5.gif 2005-08-08 22:22:55.000000000 +0200 @@ -0,0 +1,5 @@ +GIF89a + +‘fff```ÿÿÿÿÿÿ!ù, + +”/1ƒ§ÜÒŠ¶Gq|¡û,âH–K; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/html_wrap/frames/postage_stamp/frame.def gallery-1.5.1/html_wrap/frames/postage_stamp/frame.def --- gallery-1.5-pl1/html_wrap/frames/postage_stamp/frame.def 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/html_wrap/frames/postage_stamp/frame.def 2005-08-08 22:22:55.000000000 +0200 @@ -0,0 +1,83 @@ +session->offline && (!isset($gallery->app->rssEnabled) || $gallery->app->rssEnabled == "yes")) { ?> - + user->isAdmin() ) { ?> diff -Naur gallery-1.5-pl1/html_wrap/gallery.header.default gallery-1.5.1/html_wrap/gallery.header.default --- gallery-1.5-pl1/html_wrap/gallery.header.default 2004-07-17 13:35:20.000000000 +0200 +++ gallery-1.5.1/html_wrap/gallery.header.default 2005-08-16 00:56:27.000000000 +0200 @@ -11,21 +11,14 @@ // * Some application variables: // - Gallery Title: $gallery->app->galleryTitle // -// $Id: gallery.header.default,v 1.17 2004/07/17 11:35:20 jenst Exp $ +// $Id: gallery.header.default,v 1.19.2.1 2005/08/15 22:56:27 jenst Exp $ ?> direction == 'ltr') { - $left="left"; - $right="right"; -} -else { - $left="right"; - $right="left"; -} + if (!includeTemplate('gallery.header.tpl')) { ?> -
@@ -29,11 +29,8 @@
- - + +
-  album->fields["title"] ?>  - -  album->fields["title"] ?> 
" style="background-color:#f60; border:2px outset #ffc8a4; color:white; text-decoration:none; font:bold 10px sans-serif; padding:0px 3px 0px 5px; letter-spacing:1;">RSS" style="background-color:#f60; border:2px outset #ffc8a4; color:white; text-decoration:none; font:bold 10px sans-serif; padding:0px 3px 0px 5px; letter-spacing:1px;">RSS
+
'; + + $html = '
@@ -34,11 +27,11 @@ diff -Naur gallery-1.5-pl1/html_wrap/general.footer.default gallery-1.5.1/html_wrap/general.footer.default --- gallery-1.5-pl1/html_wrap/general.footer.default 2004-12-02 23:20:55.000000000 +0100 +++ gallery-1.5.1/html_wrap/general.footer.default 2005-04-25 12:47:46.000000000 +0200 @@ -13,7 +13,7 @@ // a little. Use the following code snippet to display the current // Gallery version linked to the Gallery home page. // -// $Id: general.footer.default,v 1.2 2004/12/02 22:20:55 jenst Exp $ +// $Id: general.footer.default,v 1.3 2005/04/25 10:47:46 jenst Exp $ ?> session->offline && (!isset($gallery->app->rssEnabled) || $gallery->app->rssEnabled == "yes")) { ?> - + user->isAdmin() ) { ?> diff -Naur gallery-1.5-pl1/html_wrap/inline_photo.header.default gallery-1.5.1/html_wrap/inline_photo.header.default --- gallery-1.5-pl1/html_wrap/inline_photo.header.default 2003-10-04 21:22:35.000000000 +0200 +++ gallery-1.5.1/html_wrap/inline_photo.header.default 2005-07-22 18:11:13.000000000 +0200 @@ -1,5 +1,5 @@ album is the current album // $gallery->album->getPhotoId() is the id of the current photo // -?> +?> \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/html_wrap/photo.header.default gallery-1.5.1/html_wrap/photo.header.default --- gallery-1.5-pl1/html_wrap/photo.header.default 2004-07-17 13:35:20.000000000 +0200 +++ gallery-1.5.1/html_wrap/photo.header.default 2005-08-16 00:56:27.000000000 +0200 @@ -1,5 +1,5 @@ -
- - + - +
+  app->galleryTitle ?> 
" style="background-color:#f60; border:2px outset #ffc8a4; color:white; text-decoration:none; font:bold 10px sans-serif; padding:0px 3px 0px 5px; letter-spacing:1;">RSS" style="background-color:#f60; border:2px outset #ffc8a4; color:white; text-decoration:none; font:bold 10px sans-serif; padding:0px 3px 0px 5px; letter-spacing:1px;">RSS
+
- -
@@ -29,9 +29,7 @@
- +
-  album->fields["title"] ?>   -  album->fields["title"] ?>  
diff -Naur gallery-1.5-pl1/html_wrap/search.footer.default gallery-1.5.1/html_wrap/search.footer.default --- gallery-1.5-pl1/html_wrap/search.footer.default 2004-11-22 22:43:16.000000000 +0100 +++ gallery-1.5.1/html_wrap/search.footer.default 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -galleryTitle -// * Gallery developers would appreciate you promoting the Gallery code -// a little. Use the following code snippet to display the current -// Gallery version linked to the Gallery home page. -// -?> - - - - -app->rssEnabled) || $gallery->app->rssEnabled == "yes") { ?> - -user->isAdmin() ) { ?> - - - - - - - -
- - - - - $GLOBALS['searchstring'])); - } ?> - " style="background-color:#f60; border:2px outset #ffc8a4; color:white; text-decoration:none; font:bold 10px sans-serif; padding:0px 3px 0px 5px; letter-spacing:1;">RSS - - Are you happy with Gallery?
- Make us happy too! Donate!
- (only admins see this message and button)
- - 		- <?php echo _("> -
-
- - diff -Naur gallery-1.5-pl1/html_wrap/search.header.default gallery-1.5.1/html_wrap/search.header.default --- gallery-1.5-pl1/html_wrap/search.header.default 2004-10-20 00:07:22.000000000 +0200 +++ gallery-1.5.1/html_wrap/search.header.default 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ - tag. -// -?> - - - - - - - - app->rssEnabled) || $gallery->app->rssEnabled == "yes") { ?> - + user->isAdmin() ) { ?> diff -Naur gallery-1.5-pl1/html_wrap/slideshow.header.default gallery-1.5.1/html_wrap/slideshow.header.default --- gallery-1.5-pl1/html_wrap/slideshow.header.default 2004-07-17 13:35:20.000000000 +0200 +++ gallery-1.5.1/html_wrap/slideshow.header.default 2005-08-16 00:56:27.000000000 +0200 @@ -1,5 +1,5 @@ -
- - - - - -
- - - - - - -
 app->galleryTitle .' :: '. _("Search"); ?>  
-
- - - - -
-
- \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/html_wrap/slideshow.footer.default gallery-1.5.1/html_wrap/slideshow.footer.default --- gallery-1.5-pl1/html_wrap/slideshow.footer.default 2004-12-09 17:26:36.000000000 +0100 +++ gallery-1.5.1/html_wrap/slideshow.footer.default 2005-04-25 12:47:46.000000000 +0200 @@ -1,5 +1,5 @@ " style="background-color:#f60; border:2px outset #ffc8a4; color:white; text-decoration:none; font:bold 10px sans-serif; padding:0px 3px 0px 5px; letter-spacing:1;">RSS" style="background-color:#f60; border:2px outset #ffc8a4; color:white; text-decoration:none; font:bold 10px sans-serif; padding:0px 3px 0px 5px; letter-spacing:1px;">RSS
+
+ + +
@@ -27,9 +27,9 @@ diff -Naur gallery-1.5-pl1/html_wrap/stats.footer.default gallery-1.5.1/html_wrap/stats.footer.default --- gallery-1.5-pl1/html_wrap/stats.footer.default 2004-11-23 14:50:32.000000000 +0100 +++ gallery-1.5.1/html_wrap/stats.footer.default 2005-05-23 14:39:04.000000000 +0200 @@ -1,5 +1,5 @@ diff -Naur gallery-1.5-pl1/html_wrap/stats.header.default gallery-1.5.1/html_wrap/stats.header.default --- gallery-1.5-pl1/html_wrap/stats.header.default 2004-11-23 14:50:32.000000000 +0100 +++ gallery-1.5.1/html_wrap/stats.header.default 2005-08-16 00:56:27.000000000 +0200 @@ -1,5 +1,5 @@ -
- - - + + +
    
+
@@ -24,7 +24,7 @@
- +
diff -Naur gallery-1.5-pl1/html_wrap/wrapper.footer.default gallery-1.5.1/html_wrap/wrapper.footer.default --- gallery-1.5-pl1/html_wrap/wrapper.footer.default 2004-10-20 00:07:29.000000000 +0200 +++ gallery-1.5.1/html_wrap/wrapper.footer.default 2005-08-08 22:22:54.000000000 +0200 @@ -1,5 +1,5 @@ app->debuglevel) . '
'; + if (empty($GALLERY_EMBEDDED_INSIDE_TYPE)) { + $infoText .= 'Standalone'; + } + else { + $infoText .= 'Embedded in: '. $GALLERY_EMBEDDED_INSIDE_TYPE; + + switch($GALLERY_EMBEDDED_INSIDE_TYPE) { + case 'phpnuke': + break; + case 'postnuke': + $infoText .= ' '. _PN_VERSION_NUM; + break; + case 'cpgnuke': + break; + case 'phpBB2': + break; + case 'GeekLog': + break; + } + } + + echo infoLine($infoText, 'error'); +} ?> diff -Naur gallery-1.5-pl1/html_wrap/wrapper.header.default gallery-1.5.1/html_wrap/wrapper.header.default --- gallery-1.5-pl1/html_wrap/wrapper.header.default 2004-10-14 02:21:44.000000000 +0200 +++ gallery-1.5.1/html_wrap/wrapper.header.default 2005-08-19 02:08:52.000000000 +0200 @@ -1,17 +1,23 @@ + tag and doesn't share. So, if we want to get our - * style sheet in place we've got to intercept Nuke's header and modify it - * to insert a few lines of our own in place. We could speed this process - * up greatly if we cached the results and saved it somewhere handy (like - * the session) but then we'd be vulnerable to attack by somebody who has - * write permissions in the directory that the session files live. They - * could create a bogus session file, set that ID into their cookie and - * then pass their own code into our eval() below. - */ - $header = ""; - if ($fd = fopen("header.php", "r")) { - while (!feof($fd)) { - $line = fgets($fd, 1024); - $line = str_replace('', '', $line); - $header .= $line; - if (strstr($line, "ŠIDAT(ÁÁIQ@Áy»?»As Š´« iÅìÁJ½êAWPg:œ —(Š˜š И€‰jß<ÏÕÊà@K›CÅ–ÖϵŸ…,ey¿}{jÇ_ó]÷} N”ªt5€}ÛßÚfiKkÚ¬ â¦úƱÇá ¼\¿ž>v™v»=ãÙ?kQPóÒ¥EIEND®B`‚ \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/colorscale.png gallery-1.5.1/images/colorscale.png --- gallery-1.5-pl1/images/colorscale.png 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/colorscale.png 2005-04-25 02:20:00.000000000 +0200 @@ -0,0 +1,6 @@ +‰PNG + + IHDRdÀ} QûgAMA± üatIMEÒ$‚ž¶Å pHYs  ÒÝ~ü,tEXtCreation TimeThu 15 Aug 2002 19:34:55 +1200º¤/tiIDATxÚíá‰G„…°áìýÓ' pG pG PÂg g ‡ g ‡p 2H`ƒ…Äôüy·uU¯{º{vk¨_»³s³Óß½WS3Ûsÿ^Y®Š=)zZô¬èyÑ‹¢—E¯‹Þ½-zWô¾èCÑMÑÿQ¯ýðxÑOýôtÑÏÏýò|ѯ/½z¹è·×‹~³è·‹þ|·è¯÷‹þþ°èæ櫾-÷ïy¡î`}GèŠÐCBEŠÀû¾èÔ·–—“kZŽÖO Ö¿€b¾`þßÐËÝk6Ä®‹˜ 2;&"f²rdMÂÑuÓòr¥*6ÁÖÁËHŸõè´¶ë5ÅËdMé³">•> ÅìØ~Ý>knŸµ6¦æ>Kê QÚgíÁg­ãÆ ûv>«_wÍ:<«Òg 2y–}Ö|> Œ3ìkaªäHÊEgMì³Vœ³òÍ#Óœ•·ÏÚyž%ŸÕ—#׬ž> œ¯3çb=}–ó¬ ȳ€šû¬-‹—É›g1¥ªydêë†ûì†CÊ™$û¬“uzùÜHÇ V[žè`™¬ 5ŸŠâ++,ë¤ñ•¨#¡>ô™¬Fdã 8e(®ÌàYû´¾UÉFÌdÕ‘.à&"¶]ÍôI¬ÝŠ˜ÉÚÌ:€úc¬bLͪ¬PëÇÉ +åšµY‘ðÃSŘš+”Ä@ÌÝptÍÊõG@„ä³€q—z_DÌ5k²¤vÖ‘ÐÈÕ,iiç±ÿ2YCó¬Ê‘ŒŒ4AÃyÖÜyV®×jnIm1×gM“gIˆÆÄ$ + G9ÄÀ÷2Y}ó,0J€éL©Y cJˆ9ÏÚUžÅD”:P³@›ky>7Ý s)Èbæ)Õ,pqHò}γ&γZÝÐ ù¬ˆ¸ Þð6“5ôDúsk1ˆWèî|Åd$몑į/¤WâM®‰WLÖ6du æpúÇ;  wþd/µ‚ð à ‹[^×a&ˆß‹bÍdÕ’Åx0n‘šV5+Åà¨YWvÍí³ÀàTV1©fÅ·ÖíÄâ•k‹·/“Õ¾VªOÎgEj$ @©BUÌdmX³$ ÀÊ€#©Qæ€JZy“•$+ÇH\0Âpבþzí  ÉÚSž%¡‘sù`&`š¬îy–Ô}4® Œ!ׯ]³ú’Å8] (†5¦f1çPγög Ê`¸$Ž \³¦97¬l”Lš.‰Éûgí!Ï’|ÍA¹<Ãø,&ïÏ].t7ÁK¥*¾ÂÜ£«Y•r7œ/uè"çYÓ‘õ!æ&¾ƒ˜O1ù&kK²*9ZoÇ |,:¦4ˆ5“Õªfu(Ub£‹—ÉÊ‘Åoæw ‘¦åå&ÐêƚɚÒg1ý@÷ñ´ì³ÎÎgIÅ T±JŸÕ—5“ÕÓgU"ÖÜg1ûcŸ5ŸÏÚ®å5÷Y+³MX3Yø,0’•>ËyÖeçY«"Ž©ßáçX‹ÈÛgí<Ï>[BŒ9%`öçß"û¬=ø,©åå&ÐbNg]RžÕÓg—÷9/û¬=ø¬GŒÏòuCû¬¦ˆI½O*^öYƒºáÖè˜FÉäYwzz“µ1Y§—óŸ=Ëdµ'˳g™¬¦dyö,“Õ”,ÏžåšÕÝg]ôìY&«}7ôìY&kãšuѳg™¬$Yž=Ë>koy̞֙e²ºæY4{–ÉjF–gÏ2Y3åYg;{–ÉêqnXÙ(w9{–Éê‘g]âìY&«G‰³g™¬ÁÍÙΞe²F¬íØÚjË&k>²¤O8=OS•~¼Ó•>“ÕŒ,p¼¥6O?z—Á<â<>ë¼’#„˜Éª% <p¨‘ž ]Y³}k· f²6´`¤þ«S³*+ÔúqªB¹fmHV$¼ÅpÄT1¦fÅ +%±s7]³rý!ù,`Ü¥ÞsÍÚ€,©u$4r5KZGÚyä¿LÖà<«r$##MÐpž5wž•ë5€i2¦-溳ó¬iò, 1ИŽÊL!€£bà{™¬¾y%@t&ÈÔ,Ð1%Äœgí*Ïb"J¨Y ƒÍµ<ŸŽî†¹€d 1ó”j¸8$ù>çYçY­nh|VD \ov„É–/eäÁ“'å¡IEND®B`‚ \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/00.gif gallery-1.5.1/images/ecard_images/00.gif --- gallery-1.5-pl1/images/ecard_images/00.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/00.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,29 @@ +GIF89aFSöD@RRRãѴДh˜V8s1¨rSЮˆW55ºrEŽ*&®®®¢bEöîîÖ±™¶ŽjÞÎÆS"smÛŸkƦzkjj¾†PÖ¾žB6²gDñØÀ¬†}wT:f5'‘B5³Ž~ªV;d&©uo롆ŠRH8"%t:*Þ¾ŽÎ¢†óΙá®j¾zg™d\൞ôÄ’æ޾Άg   ÀÀÀ~wwîæáÞĦjB?JBJ•:(‘€à–q¦J:G#%ïÁ§¦“†bR¼ž–ƶ®þþþ›WP³h\òÒ´ÆzMæÖÁ~JD†:*þæÆÞ¦Šx2,ζ¶Æb»†kÓþzRNg:5¦ZNb* þÆŽÆ¡•J¦d_¶––㳞:2¾zRÙÖÍT*&J:‹ZR:**,FSÿ€DD_‚O‚ …ƒO‚@‰_@ _ƒ ‰D‹‚_—“•_ Œ£—›¢O@‚­ O8 _ 9¤„9•°—@¼D84›Á_¶‚8¿ŒŒ±‚»—µŒ›O++*LII)ç,2%H:P(Vô`YúVJJL˜pbDƒ.UŒ3%):x˜8ÅÓJ²R È€ Ê‹p1’ÜÀrn‹tx”€ +*`²L §Ï0>ræC& @Q„„ 1@(¡@aâDNDr¬@ÁB†1Ž$É…, @áCAFÜÄ7sBTÿÞ&H  ¿ ýœhãD•. ´˜èÀ4ˆN´ +ÂëY·"8Ç%” 8Ѐ"•8Á$ 2‡bRO©7øúZá°–…„I ‚#Ú¦/+"@€,’ã9`p9ààü¬Xé‰cJë.\0Ý®=ˆ‹ÕJôáƒI¥‡‘% MPÀ„Š‡ID.|I%ƒ8‘%Y0‡…J¾D÷Þi· ®GÂvCSˆ[ V…;t€D!x0!Â\ Â7„³Uc'UàMg=‰á{°ÃDa#‚8⸠O0„ @>€C=V˜ A+DØÐÿS&\ ÉÃwCc+@ÁBðgT˜p@dðÃ/”ù‚ +MÌ „@6Ñ#Ox‚Ôx™ð€!8¡Rìy€ŒÌR 7˜“ &€B(áˆÅc?Üpà pÚ)*`áf„=€ÅC0eCªL×€ðHBHÐÁB¸ð….D$C )ª x€‚LàÁqÄ7@[&M@ª¨n²IBRI ± B,èÐO$aÄDHAÂR!L|ˆì9)€ +ati…²;ÁA8ˆ”(W¡bE†£vIôH¸|ûÉÿJQE €K©å2’ƒ8‰Nƨ 0yà‘V“œ¨µ*ŒÈpÅ:~âíÄá"HDDL„KtÑñ`!Š2ÀF °ÂÉñhñ‚³¾Þ·)WŒÅš92µ`·g?QqDŒûA_µƒÆHÔ‘D°²Q Ì±aL€ÃÕQÜ U×OkÊ3æ¸à‚Ûu»Þ6š„.ØÀ!ìð@aH!…Ì+ßÞ0`  ðÓ<.@ó}" ðW;„íz n‡êvaë»R€±…ð? B!|"ò”S)€„:|`N@PbÁ!‰#íµ¤&ØûÿøW¬à­X|àÄNpáªäàÊ ÉU H`‚V ƾzí4U¦ín|ÜNøÖÓKH¡;ÀBˆ€1 › ¢ª„ˆ ƒ– …Œƒvµ›Ùˆ˜@-¨b¤"S”@ˆÎVAqÁÄ*Q"l£€D€+€ ˆ‚VÕ=MmêL;([ yg6áŒ×Ó‡ú4À€0˜`b… R@, ¬ 9=QV °®yí{#Ò‘¸ ‡@:VÑ(qÉœà„0$ÆÉNF PGôÀš•Ý'qP¼Ž²CI¦P2;8JELàhÁÿ tÀOP„ëiâ`"<ðLàˆ@I;i +’4 +w.y”ÔÄЀ@¦ C€>¨‡^4€ ΀\€Â*°èîx íB’¨pA2h,µ í`2“™ÌNjR1óO&ˆ¦0*XȼfP`2^C21ËD݃v…aœЂ̉ÉKúò4îÌŽRã¸DÇ þ€“¤Q+ÈÀ i@8f®‘Ðb\ŠPTÁ¸ÐM+iΉº5&àåù( ˆÒ°aD10@|®™S´1¶ÿ“©ªÀÕ¡b¸iNPQuþ2Bë$dTzŠ2'ðœˆP x¡3 ܦ²ƒ ,›"ÇZ`„ÂVá« )Y/™NŒš 7«YÍD°ž ªpM\3XÀ`ŸÁÉ„µ09ÒpdRa [ÎÄ~•¦µ$;ß‚Œ£ ê2}p‚1œŒ¨Á¢P½œÝ{ã­Æ¢h¢Õû€ D@PxÖ}ºÇp'Ò|ZÐÔ8f·©5-0ÚÿxøÄ ~råÕ!çŒ +@¡KØÀ2ÕµC1ZŠ»ÝâF­Í‚m*Šæc +ÎMªÿ5Á (@ÁÀ0¯Ô˜0¨Syà€%Á0ø +Åqw«#L ÑiwN6£<‡Î±Ç|Ô€Aø@1p!CÁðÆK7/3k ÖFàÀKÏ”#R­šÕA'A^rHÿÈkDpÀ €¶C:袳¡Ðv‹B dp,0Á¾cJ“§´ƒU3ðãrÁh®Öè³bXbQ¼ ô€2'ÔH÷!E-0~ÞÀñœRV^”NUÔsãô0Vàó’)ðQàáF* "°\€¾¶yÐÂ7ªE X*À;0"€4_uÿ5J ¤ã8WäÒ1=1/Q¡ àv^ MÐ*àFd0E0XXF €bOW^T:Ô;ŽC! ø`ŠçŽ+€b±I¸"°}ñ}~Ç#’€- Ævy#"xSž¤ ‚ 1‚ Q€”²m&À +dP nx}Pà†€±yÝ”qd… +¡M |Íele“ ƒ]9âZD?¥cD6b‡^Ðè g+øHæà„0¢È&fBsñç8w¤°„ !àù€1/„p\ ‰^@ + à\m´u‰“kªelädE0fÿ"Eǧk°T . ÊЭ#P"Àà†HPäö41“(/dyh…22jW&; gÇçB.pVä°!`€¦@ "Ð:`aà^€Õ¸*ð+[§sÜHXää^6×êÖU#bIÙQˆV4hg[‡$t•AP ^P(`K(wr· õ4Wq&6R-°Îš¸5;@¦'. +â8T`[81&7Â×·Ëg#°Ù< wÀÝ3™"& e#WGqdò5~ EPIwu¼ÑŒ˜à›ñÕô-aÿ :€0#3·E4·QÐfÏåõñrB§>J@hah2‘LOåhD`? fà³a +à/ç=xGq   °âVF°5…5î¨K>HWãJ”B®@¸dꃖêÃGýÑàç·u7_*±„™lds? zœkuEâƒvEiAòÑ0 …N ˜|Ô>h¹ ð“8¶S&Q0œór '&G°\e)fEU[™¼ac–P0ˆTv±)”ˆ‡–# `›¸iB£FJÄ\ ¨D g=à~òBÂ(J9‘ŠVÿ= àhq£˜À AÑEøi–Çr‘-šÂa“ñ,óu±ô%`€ʉ3aT®‘½aLV€ +•À˜²°¹ù£yHfø(}¦lŠ£=¦)ÎÒ0~Rb6á³ îy”2tƒ#ŸDà|?ª a°‘Š—Œñ [3j7 ÷u_;p]Ða„8rš6Á§õñ!9Lø)¦†z¨"ÀpqDé&0~7_'lœÂ-a°X©3ác ‘ùà áh@°-Ñ&(w‰Ú|!e÷#j33Šwe’P^`—tŠn‘ÿàos 0‹hD K€b "PìcOV YÛÂ-¨)*€K3UJ¼´C9¬0AÕ}‰À‘ö0(wœxB Y2œ~ ã˜Ù„Ÿ¦g*vŽÓqq“,ÓÅŒ°Š‰Ð(T›ý’ ³EPÃé¯ÿ¸0qÔ—*¦bcÕÓYú©pZ5€ +øéÀKX#jª†¤{±&H‹îƤš(Xh¥b½ãŸ¡xKa¶em=¡ —`Hù¹'•?ó`ó@¡T9ån[c;€u&*e†¶k5ÿ8r¡Y`ào8Ñ´8}•`Š¹–"g6 Öf£)¦[E‰;0&/€äfP.P´Ek ᱥƴŸŠ“£¡c `ø90D `fö„gW$& NP—w°v*P*p_ÌqåDI%=1n »ÁzLT@šE0V`^€¬Æ2)ôð‡$Z`H4Å€&¥›…ÐFðUº:]qÕ;sá[:A®Ù‹M#K ¸PâÆJù G["‰åìK‹ +0#ºfa ÛzaÀ>Ò²Pæo°›ÁjÑ©Ðê³#°t`®äg7.b°ÿדbF€K2à‡_ûZ-ÜÁOP5½5Fü©F̧òùÒQk(@#K/"g—hz&ÁT`§F†µ³aàaÀg1¼Ñ¸vÄ|êol|¡Ì÷½$¶tEO [¢5L2å^d^¥«8å^Ö’ƒÁ¿ÕÛ]¼uûÈ|:ª¶)æ³R{EÄœ>à«|+L|&*¹Q ž1¢7—ârLPÕtqÄÁš½IlĦ®ò&°&0‡—ö€L¢¡hÉ)†ûµgb-¨¼s€À¿ã•Æ£!¾E^<Ë7‘c•0 w<À„ÂÍ!/•½±?.2BX@ 0c)18ô¤´Ð|ͽu6!Ë÷   ròÏP' °Ï ÷ Å ÁàÏ¿ 0 ¢ ññ!yã š0Œ0 Æ` H2Œpš£€A‘0”` ˜ðÑM +$- +*íÏàŠ  +ŒH!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/01.gif gallery-1.5.1/images/ecard_images/01.gif --- gallery-1.5-pl1/images/ecard_images/01.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/01.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,17 @@ +GIF89aFSà  +  ›˜•@NùÖ’ý‹ç¤gzDIDö±ÂïÐÄìfWW-2â@2h^^üùìÜfÆ.,',FSÿ°5Ä$ 2à©3Fˆp[PM'ø#e±ÞJ4Ë0l`°ÞèÓØ`†»I²xün(³•<ý„¬vËíz¿àpx†›Ïè´)šngmüÐØNâÛ ¯µ2Ügps‚qY4 Z +|',€a„‚™4t?‹ +?ZdX•\—š™šš t  +t´‹EN¯°„žη#¸ÓÓu¡.E +Y>EÉopž‚ ¦ÐÚÕEÓ¡··Þ®¯±p GëÏÏzp¹«eà–;Óèt²¤N>O™fPP`€‚ +ÿ¸ h¬AÁwÿ:M¹ðǶ|q"ÎJð Aï2ñ€‚PïjŠ§,k<>d'l€ LÜðlc‹(¡ +›àN@©*]’8 å—üüsªç&/b:p(‹ Z107‚¤ à( ðÁ:vFØzƒÂªa`€/ÍVaâ=ð #@• +Èi0îÍÈEA:G”î\_ÁN¤ñLQAZ`$ZÛÖ€±s–`€Àó ±i:as´€2` °©ØŽ¦ÅÎ4e°y2½< K$åŠ)>æF7r»©³ Àðo7ÑLžÐðT’Ûµ³¹î‚}&@•„öïŇFÿ¢´K&ÏD\oÛð•NwÉ¡á\£A]ä‡Ý\ßô li˜D¡cºÝg”~.=£{î¢|AüQ!Ï, ÙKtí5–{³¸ñŒÆ’ j¨õFÙF$ )HWr¢ÀW'" µAÕˆ$’#Èk P¤.9è^„!.†J—”rW†¡Œ¥Ñkß›_æH¤§ð(òbÀ)Ü°AõÁJ–¡à34ð¹À»Ú c:æ¤.Á¨AaNP€&Á +HAÛ‚¢‚tU1pBX¿ +mtõ˜"!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/02.gif gallery-1.5.1/images/ecard_images/02.gif --- gallery-1.5-pl1/images/ecard_images/02.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/02.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,26 @@ +GIF89aFS÷ÿÿÿÿ111BBBJJJRRRsss{{{„„„ŒŒŒ­­­½½½ÆÆÆÖÖÖÞÞÞ÷÷÷kcc{kkÿÞÞJ11„BBs!!!9„÷Ö)çB)J!ÿ1Þ¥”cB9Æ1¥R1œŒ„¥9ÿZ”kR{9Þν­c)!΄1µcÎŒ1ç„÷çÎ÷œ!ÖŒç­9µ{{c!ÿÆ!Î¥)ÿÖB”{!ÿÆÿÞRÿçcÖµ{s9÷ÞŒ{JBÎÆZÎÆÿ÷œœ”ŒŒ„ÞÞŒÿÿœÖÖcÿÿsïïcÿÿZ””1ÿÿ9ÿÿ)RRçïRÎÖ9Þç­µJÎÖRœ¥„Œ9­Æ)Rc¥µZ­½s)1„”Zcs9½Ö„µï{½ÿ„Œ­„c”ZZcZ1B1{Z{”Œï÷÷ÖÞÞµ½½s{{JRR!))½ÿÿ{µµ¥ÿÿZ””JJïÿçÿ!Œœkœ¥ZkÆçï1Öÿ)ÖÿÎÿJœµ1k{”­µ¥Öç!ÆÿÆïÿBZc„ÆÞR­Î1sŒ1µçŒµµïsœŒ½½ÿ)9Js„ŒÞÿZÎÿJ­Ö9ÆÿcŒ”ÎœÞ9”½œÖ¥çµÿZ„1JBcs­¥÷1{¥!{­µÎÞs¥Æ)BR{Æ„µÖ­Îçc{”!R„9)cBRsRc”cs­œœ¥kksÎÎÿ­­çkk­!!9cZ{ƵïR1„9csJ„ÿ÷ÿÖÎÖÿÞÿ”s”ޜތJŒÿ¥÷ÿÆ÷JB½s­ÿ½ïR1J¥Z”ÿ„ÖcJZÿ¥Þ÷„Î÷ŒÎÿ{ÆÖ”µÿc­Þs¥ïs­ç­Æµ{”ÿ{µœs„­k„¥c{B„Rc½sŒÿc”÷ZŒÎ”¥ç”­ÆsŒÞkŒ÷1kÆŒœ½„”¥k{Þ„œÖ{”½c{­Rkc)9”9RÿJ{¥csœZk„BR{9JÎc{µJcs)9{)R)1¥RcœJZÿ1Ö{Œ­Rc”ckR!)œ1BµZÀÀÀ!ùÿ,FS@ÿh€TÁ ƒ"  q¥ÐAv%pÀb‘…¯àØà"O0¸«‰j06PóÀ0éÜɳ§ÏŸ@u:²° €?LtùC€&4ƒÚÀ#È  Qh6é„€@×+A{Z¤sÑžcuž}³Ó¢Ú.¢cÙ=>.ÐÑ9IQÙABEÒÉ€A´ü2(˜@XµŸ˜ ñä–‘-”÷p +L™Òƒ”ÜÖy"¦³žÈ>þ ÁŒ«÷ì‰ÄŒlI5²PšÄfÓ›2’öÈ)#‚¤DJl¢³§ŒT{W³Vð@ãžf“sêïœ?ƒyéÿïÏßG]àÁ;PhpmP#0O³œ“Ž;ÖsÁK´O8â„Íà•Q5Õ°“ 9ßÔÝ:㬃7þT’ÖjĆO{ðsŒ2ÇðB 0ÀÌ10ÖX£à Sc0¾ L0¼3Ì3ÀP£‚;¾*Ñ­Fè ™$b‡@ ãæ˜3Î8Ô¬CO6ÒT#Í—Ò¬ÃN5ãT³Î™š#Î9ùd³N9Ò4SNôèãÈn¸1U'ùùô$F(`×鵇^¤”F:^{•VšÀ:†Ø”F´F†ta©Fê©aÐØ'¢êªOŽÿ²S$òO€Äj­=`þ½*¬NMe˜˜œ4€Qm gÄÀ)Zab€FldP( tP¦&ùÑ‘È!ª‘•š[zÌaª«hð€+וjÉH »Ç!LH‘Ú\üÈ"—ØÚ"kf!OlR¨«|dNˆìTñ"Õ$£1Úã11?òòcÈ$ð?z ä{.B³Í1ÆPòpPû=ðŠ§Ï–íT€‘xèùSN3Ý°‡^ÐûTÓ :ÖéŒA˜“Í>k˜œLp«$ﺕÇõ¸SO=ó £e;ÔƒÏ8Ù0øæḙ͗²=Ž8ã`“Ï:æ(ÿ€L>DÒuP€lO{’%:ñìÜN<¶ƒÍ<ù´“™ãx™y‡oŽ“&=õÐ=9„ƒ>~ þS,½²l àùàÄ ]¸Ã„QØ€Ì &lñ„?pQÔ1Lá ¬P X,ñCeQ:Ã:”=P¢ÚÐ0”‘Œc$ãð\Ç⹌h$cÓ€4œ1ÿiÀˆÏ0‡-Z¡ˆ@>fôQÃ1W +u <“‚Òx.4]ˆG<@"|Þó€÷XTd˜†6p‰™ý„1À+°C‰"<ÍkG?¬4 Ý* üár` iïA”ÐúñbèÂäÉ+V¢ì," +°À€ÜÑy<)¨þ¨7šŽó€G`S6â‘Žâìȇ9rjI$u'ñiM½v²C`€ª ;Ða°}ƒÑ`7ìY ”CrÓ8¢Q +|£ô8Ç8ÊŒu` ¤’ëGP”}Ä@Pü¡‚|L`ú˜Q€Ó‚1°Æä@ ‚ÿ£ ˜€ +ÚŒ6C€šqŽNI'b€ O–Ì£úpÇ>(и½º£ØT좣õ‡9ÎAw˜#å(Ç:ªá}€ˆ‰™Åˆr1Q1Ù`â ÐÒ<ÜAj¸ÉLÙ¨†5¤Aàl°CMëH0;豦6}ÉÔ]>òv øa’ P±Ÿï!”A|À&”Gé†?¼…\ÜèF7¼QŒWÜâÝø7~A  þÀE4pÑ'üÀ +×H †Ê—J‡OPÀÉ°€)úq2(A Wð‚X ŒSta L¸Á <¤BÿCÀBh`…&Ô` +Ap 0`ƒÀ"S/…Iu‚I‰< ,‹è„ÈÀ€Ç pÈ2þ&Méx‘¡| fP>c$e©ñD&:AßE– Ä"PÆ4J$hH +PÀ@b“–µj*& ÄØÚOB²’“$ "ó:@GŠ@/PÙ"%R@HN‚’$# 0c$€@ƒdBƒd? @Æ+ÔÐà HÈÀ4$€ÔI7tQ„`䈈+ð‘Y2ö]„WÐçÊ~…EˆHáÖ]ÃŽK Ó>€ÇO úœçÿ~!a`- +A  1¥0•²ã】9 +¤¶DN|… Ï#lõø¨VjóÕp1‡7lJ 먀x@‘CL¬äiºt¢uìð$šÀ ‰@„‚ˆr@èK÷ŠÙ½îx¿»Ýq÷KPˆß™’ÃgíÂX#äÞ”F4źè¡"1á+ЋT +E ””\)( ¡l¨hKàT ⃧˜„&ü‘ ÐÂ…·J–+>CÎÕP"ÑÙC%<³”€m¡;6°—}i€˜{˜ òÃëÄ¡(àAhq@ ó-'ÿ4`DìÁ¥ŸVѤDXt¸ƒ1 `À]aA CÓäd¡¥‚ù!GœEn£pF¸„  jÂ'}`{0 +œ0"®B/~Ÿ6 +: Ÿð´ä“pKžðø N€{@ +=Àâò*þ‡Lg/;À¤p> ða .Špa‚vA )h– ¢4,\qsµa—€/°´ °U@‰~”€ a¼T ã•4,J®° vJ€P¸!¸#øX(0@‹` +LO0 u*®PhPsÈ$DðfÁ‚, 3çã@„Ž2 tÿ@Ÿ™@‹@:  +{H*ðp€øæ—8P 3ÒOÌ@#,’ ÓÀ ÷äO0‚Š4  †€ >Pˆ€ˆ{P}ºh1;áÓ¦@?±Š°øD Ë° ÷Ô1£Á 2 ƒ2sŒÇ˜OÉ  Π à0 ½ ƒöȶÁØ"å"*T˜"QçxQ*ƒ2)ó#è‘ ßÀ š‹YSlÁÂ{pÎp Qþ@5Q—bnU)Å fÕÁÄ0@$ba‡8ÔÀ V˜Uô€ôq âÛ0•R£…)Á4!¼à uÐýW"s‡8½ JY%6×@/%g€Äÿ@ŒQopäíð¥!âgÁ … ’;Qy›…8®ðþ’òC‰ý0XÜ@/éÑCÝ UúuC9û€ Ò@ ©5€qñÐz…`2á“âÀUã`2“ÒnûðOƒà kÒ àFÁ”;q(è‘6tI ôàþð +þp ßP Ü Ü@ Ò‚7 ˜yþÞ7’` Ž W21ƒt¥aãé Zò ì{É "â0 Þ@rã þ57Öô°à ùà€c o¥TTFe(²€ %íÿûàð`éuÞpä^äpëà æÐ å°92ö! &Éàóàöu\ ÀoE€8”`ÓÀ"6 Ì0#É@ ÐNëd¹p ©XŠÌ` ËÀ"å #0$ËP#ö~Q¡…>a.%9{åáÁµ¢¹À*º¢ˆ£2Z£0Zpþ€ÇEЉt5™üi6D: ѵWèT… èØÀ6Õ Ô0¥Îé_ÌÙ Õd@‰¤B± ]³“I¤èP6|# q“ Æ)þ5 v`ðÙ&bÂ"VÕx›|0 …²‹:}àH_²‘ †ðþ€*ÿ]éÀ&jb&fœuC æ_UZ&ŠÅ&¢c 〠1àdà‘ +–@3ò1 Ö¢bFQ@w“œ¿` Üà9V æ ÝP&Ò 16 ¹p Úá ¹ Åp Ò©M;Eð‚=Q1 €ep'Hpå‘N Jà´ð Ò ´àJÀS@ Æ€ ´L€5PLþLàTpNàJ÷c/ +ƒ†(6ñ +¶$("ö +Ap9P³`d€_€7Ð#ÀVg;p2CUpW C RÀM@N àXÀþÐÿ%(ry}àh’µ TpðgQ F€k Ù ¯ [°ªGå +¨°ª”¦00R¶{ %n ÀHö³”V¶e[á +ª9Wt ‘à#€Ý)g¶x  @ð À Ù™,ŒÔ{¼(sA ƒà„/ð(Ð ð¥ EI;F` &P$ÊÜ° €Ž0Š I«ËÒa¨"vQ~†€K”°¿ôK”à ³; ÿB.©Ëüa D /ànðFPo÷†  ðE€o€—\×€p` 1¯ ÀgÔËjP/Q8; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/03.gif gallery-1.5.1/images/ecard_images/03.gif --- gallery-1.5-pl1/images/ecard_images/03.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/03.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,34 @@ +GIF89aFSå"†††ÆÆÆBBBž¦¦bbbææå¾¾¾¦––†rrrrr"""ÖÖÖ®¶¶–––ööõRRRvbbÖÆÆbJJ®®®–ŽŽÎÎÎJJJ222涮ž–jjjîîízzzÞÞÞ¶¾¾–žžþþý–rr + + +ŽŽŽžžž***ZZZrjj:::ξ¾JBJ¦¦¦¶¶µ,FSÿ@‘ˆÁjL&a¥84i„ˆ$Qi2†•¤h)d®Ó*ÃfŽ¯ÛÆPƒº+ +§Â¨ ÈDÎÓ4PǯU&Ovj wB€L*BrB|WvOL[ +ž +  + £ Ÿ¡¡ž«ž©Ÿ®£ž £·¹¹¢·Usœœ¡¥¼¨·¨ª««¶±Ä±¶Å¸ÃÇ\"Á&®¢ +&à¼ÍßÉ¥# #+##ô+)Ǻº¼ ¸1Á)€¦ t0ðÀ¯܈è€Ð˜°~%HØ^ÈÂÖµ“£TDÚÂ@Á [@`B¢<¸pÿÇaY§(ÄÛX¢ (î­@‘©þnMÁȃÆ)ø `㞸Èà@ÄRÒEæ àJþ¦AAäµ..À¾Ä"øt5Б7ð‚(PªÛM so§¨à+ Ÿ‹Ñl[KjMðÐÈÅ2À‚jc 0GÅÃÛ)0>fxÀxÆàã’TB8€ ^ð‚Ý(…·hfu7‚uhäÄ3Và©Áa &pÀ Npÿ zƒâ¬‘/¡NRΊa0¾ %zB)XÒ's qÈñ¢»# ½62s™î}M$ךÁ + .ƒ×¹ÉšÜ”:WŒÏø@ ]P€T˜*1L0A&9H”éo  +%>@­ +@^hR6x)(¨\`äÀÜ@“r=Y™`øR0€p@ò ù@Á*€#g–ˆ&dÀüÎEºQÈ-‚Mr&4ó' a" àÃÞáÑOÂ@%=aijº¯ +øã,¡y•¼q 8³:6Sy;–°m'8 cLð‚%@ä|e’p¤SRÎ|e*Dq"yÎS!¼ü1“… +D´ÿr<`}‰­éU Ô)©u6ìaZ8iv©Mj¬z(aR]€Ž˜†Þ£ .Ú"Hf ë\'8š“…ÐS›» «XÇ;¦pé `:੨OhËG{JW"ÞìL(m(Y©åCÞñ•wz½â9šzV@Id¦bQ,‚™IºútÁéj*±w²†µžD%¦Ïq=Ã|BÞ[›Á„06—ë©ejñâ™ÌS¥?"«v·Ë]¦²w.u¤çh+4Ô•RAº ÆòÔ±¹€N\;Ô}*u¶Ô‚d6ÇÔÝ"³¶r€C¦½!ˆ  >©I:›Úu ›>„ÿmJØP¿*„O::àY#z@Qô2 ÛÙ¹XÔ–ð¦ó´ Íäv‚¢ëñ œ²½ÞmI¨#Ú^À©Ü'µðq0¬tZxŠ­3Þf K(@˜ üC°44º¼C§R^:x¶@"ª7Sq@Œ”ð‰Ž;œNdà+ + C’ÊCÈÖ¨»TP„¯Çņ¢ã2\tgæW5´Aj Âë“\úØhÂÇÀ'—ž3€ÝeR%ùo8 ¾YϱÞ>ѯg,’ cwÜ$»¸öK +Š;ËÃ;¶·w:z€TÞF4Æ(ªü(–Ù|h^ëúéÓ¥Z)KÇóDû=ÿÜf‚ìp=â 4±gaæ UøÈõå%½ y=¦Á‹700|[ÿéu¨';•@á†Õ ìF-Þp2‘ñ "€ó¢uQÿ°k³°áí†2·€~žÕ c†8® l†Uv²_L0Ö'ø°nCrz¦Do0%¥P Å l~/6RL)‚|Í<Ô÷]ø@GØ9º&á@M9dp#CÃIé&Þ01%R0èXHP ´׶Q™v;Gø‰SQ'ã3W’"²•`ÖPZdPl:XQ-†»Z‹ÐT‹¹HpÿlÒJÔôÁq Ö1u•%VZÔ[¼ lŠlã@Ç W€/ø¢‹­JᇗÂìÓtÕs‰¤g€ä Þ l¦_îW– ¸è‚øÂ9fèô­Aߘ „F| b\†. d‘ÑtIir;ÖX±05pö߸SHÆ¡eÁÔJëà{ñtž@?¢- Iq’H˜CBÒ¼†6OAôðF[×k>Ñw°ÑZÈ¡=å (BÀ4€ah,°Q”y& Š¸ç‚)0fñW— U`’Jq•W5‚á9×aI¡\ðJ3&™‹÷È>ÿk3+!ö6Vsyƒ•Y9‚AMÁ"*mSS‘•TÁaÊV,ÕÃ;UkÍâ8 +`{‡88V)8Q!=+àQ b R…GÕð——_¼5ØÔJ– +ÓpYšIÁwÐJ×a]Dw2v¦Ñ +:Höõˆrt©ô¤¥Q¸ÐGU@¨‘1C3}àZ½Ca“¯ H0GœµEw”­TNírIÀ/ÿÃ-ÑÁq2—!0ÄMéñoPCLÅ[—xíÐmõ8#CT…e ,À @-* ,ð]@!õ ‚°…ð]- ŠÀð] °5&°'[7"°ÌÄG`J`ÒIpT`X ÚpW ¢b@"PŸ]àJ làA!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/04.gif gallery-1.5.1/images/ecard_images/04.gif --- gallery-1.5-pl1/images/ecard_images/04.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/04.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,29 @@ +GIF89aFS÷ÿÿÿÿ!!!111BBBJJJRRRZZZccckkksssŒŒŒ”””œœœ¥¥¥­­­µµµ½½½ÆÆÆÎÎÎÖÖÖÞÞÞçççïïï÷÷÷çÞÞ¥œœskkcZZεµB99¥!!½1!¥9)ÖZ9½9ÿ1ÖJ!Æ­¥R91­)ç9„)Î9„J1µR)­J!ÆR!”1Þ½­½œŒç{JµZ1ŒB!Îc1¥9½BÿRÿïççƵ֥ŒÆsJÿ”ZÖ{Jÿ„BÖc)çk)ÿk!¥BÎRÆJÆœ„¥Z1”J!µRŒ9ÖR”{kµŒsŒcJÖ”kœJœBµJçZµc)½Z÷sÖŒRç”R­c)­Z¥RÞkｔƄJ„JÞcïkB1!½s1Æs)ç„)½k!Îk”Œ„ZRJέŒïÆœ{cJ組„cBÞ¥kœsJÿµkïœJœc)­k)ï„ç{kcZÿÆ„Æ”Z¥{J¥s9œc!Æ{)”Zÿ””Rÿ„ŒkBµ„J”k9ΔJŒc1Ö”BÖŒ1ÿ¥9÷œ1Ö„!ï”!ν¥„kJÎœZ÷µZ­{9½„9Ö”9ÿ­9ïœ1„sZ÷Ö¥­ŒZÞ¥R÷­B½­”ï¥1ÿ­)cZJçµZÿ½Jÿ¥”„c91!­”cµ­”skR¥œ{{{skkZï÷÷µ½½{„„ÖççJRRJZZ1BB9ss”µ½¥ÎÞ9{”R{Œ1Zk1”½”¥­s„ŒRckR„œc­Î!)ŒÆJkZ„­ÿBsŒR”µR¥Î){¥1¥Þ)Œ½!ŒÆ!œÞ„½”Ös­Bcs­{½1kŒ1”Î!{­!„½9ZsµµÎÞk„”ŒµÎsœµk”­ZŒ­B„­B”Æ!”Þsµk­s½„ÖÆÞïc{Œ„µÖBc{)!9c¥kµ{Î{¥Æs΄çµÆÖ{ŒœsÞ{ïÎÖÞŒ”œ„Œ”ks{¥½Ö”½ç!Rc{1BZÀÀÀ!ùÿ,FS@ÿ1 €€­Z„ Àà\p °B&,¨ ‚ ”ÊÂÀ‹$lLÙ0# !<ȪA ­4³@­= ÊÓÚO¡=“>×LiRs`ú³F€?uU›å À5Xañºn)… $,]ëÔ'ÑžG—6c7 Ù³µ?™"MÊsm°`=›µ0 OjædëXBÁ†þ”ÜLòÒ£;­%SDé˨=£TÚ€gÌbêÆI† ”íäÊy/ïdwL(€ Zyç»V…xÍ´ÈÒœEÐ0RRÆÈ”)Q¦p™B¤H—.húü)tê­_˜…Bÿ›/͆{ºìA¨u.ƒLL!7pÖ É p#JA(²HwØQ "‰á‡üQÃI´pF' €QZ$ÄQTJ(á rÉ%m´±A<Ø`Î:ø5SYO Ä€k°Y4ЈS 1¼˜Ò† Òƒ$upÊPƒ1áÕT8â “K&tÐNŽ4@Èoäâ7R"…We TO;ÉVf`áí”T8ËèpÍô\sݨ#cœ˜õ$Ž6&d.áøDÙP¯ÀšNÅÕÔdm%UÙZMá(o›²Õ&8”Æ”…'ÙOŸ¦*%¦²åj¥¯ºÿŠê¸-pÀ¦”NfªR‹Æ믱*uÔ¸aðJ_¹YjQ¾žék_G™CÎZ¸\CN1nY³Œ9®tíPKc °®m¾eflmåõ)UVY“ØϬ"A,V„5èR÷¤ÃÓݳŠ^3‚›n³=Ƀ÷ €Ý@ãë§Ù¶Æ©là0u*8«(€MÈ.Š±ÇëÌ£ˆeœ1‰$’ð±ƒ2Èo¨qÊ cœ 8•¾æVOÐ €G=à-@öå%Ž49Ì B @ˆð ‰X¢5#ŒøqÆ,‘ÄK¨K¢ŒX²‰%¢òÂ8¤PÅdÌò@õ\ÿÄ76õÔƒ 7E_JÅ€$BÉ®üÆ Ìõ@ˆ&ˆ ¢ z$ÂG‡ Qˆ$OQ†=q!„¤‘Æ +Lô …\¢J*ôM8ø¹ºVJ%›©r–8êà¢CxÒã<ð¨S§•­Ó E@Á2¼Çú“HÅRrŒo§dá£'>ÙàãMÂÀ&Ûñ3á¬S¿Å<á‹Á +˜ŸnŒÁÂT¦Zƒ0t0(rQÊE\ +6´ÔP<ÆKÅ/€mY A0ð€ E(wñ˜PFh”ÞõÎ(™¡OŒ¢(£åT.la¶zrF`&˜€\ÊGC¾¼5Ä7ÿVa4£PÀ– k¸‚¾è‡3þr £/° +(AßùЄk•»PõŒªø£ŒVA#¾ü± + \…®ðh +°7öÅlÉ*‚™ê‹ñƒƒÐ#Î ‡jአ´c`@ÐQ”\€\(žÆz×E̸ÃØ3B84ŒMR¬zF0|AÀÆef"*LÉÆ2Ô[‡7‘‰QŒæ øĈ!Ž?šI“¯1Óüf„p(Ä PÊ&}Ò–q”/cÄö0ˆA<⧀Å'>q5(c”aÔ¤e” bœ  †5 +¢&iRª7Ö‡&ñ«dD™p #ê‡7\ŒAWi2)óÃÏá`B½jÙÿ)ø̱D/Ø>>w¤Ç~yãføÅj‚‹¢s™Ûåa=_mñ:.8%ùÑÔUS=’`͈Ãκ”™)Aÿ +‚Ö€ ¹BO„<pt3…P%HG<’܈$%­0 0 È:%©v L. “DÀ&£¦°-BÀ­ à) , À@8‘@7©0@DP Úém·pIä¸u+ + ` "ô@X¿Ž +a½¹q§CUPFÇ3xˆ-Å&žàø¬¸u*,Hbiö†áAÆxlpADJ.ÃQà…QáŠUlãÿ€Œ6tõLTYmÆLÀ•üéŸÀÝš +-€HrX HôÅ9ˆØ rôFe*Ð’ ´Ê)tkTÃŒhœJ·XÌ@Ç5xÞ ô£'Á‰§âD>.üÓ¬éá5•ª _@½XÑrÀÃ4‚ °ÃDfF/üðB<¬ã"#cW:`€ï¢*ðŠ?€Q™#Rß²Ì ÏÎex*î°AÇ{r‹XøCÏðÀÔñÊjô£·Àû¬`k’ÓQbäo d¼2ãÆ Äs¤ ¼TãK3l¡`G­‚ý¨FeBÅÁÈ ß¿yyzÿ¦ÜÁ :`Ãç`âã®xáó¹7‘›î<“«òåþáO¼;Pa‡Ts— Ç`zS€nB>Ä·þ5•!n‡ƒB§D|ç#™à ¥°'¢ +ð j0 ÞÀ#Ç÷}È&öDCJ£­àtÒ7=„)î ¢`’@{ðOÐÝqo0 Ê %S—+ ÈNÄÀ'Ð +Áfš2„áò î` +‚@ “@„€$qðƒð ðx° çP~'ÍÔiU `Ò`ˆƒЄî’út © ]pwà5uÀ| õ^x + +ð ­`Aƒ0Ï ¿ÿ@ M QÕPà +X¶î ^ãÀ ‚ð‰W` fE`V0E08€µ‡[0W7ƒ,€X|æã± º°°¿À¼`‚%O¤o/dã YC €@ ‹€ž` vÐ2F DPQ€Sp6S E`wp’àPƒ€ì ì Ë° €Tº€ ­  õ&@ Pj˜2q0BS*Õ–Ð\ƒeÀ[d£`Ég€Ÿe€¸ ì x@кÐ7p%ñˆ ñ`TÄ%÷8;1>àS#‰` ÿ@VŒp\£SØHRpRÐ*°ù]g€‰Ð ›P ž@+€V S@ùà°7õPX´¢ Íàq0q.ùˆ *Ð-•Ð`fÐ ŸuW¯‡P…P[€g -€HÐ4Dà‰ðZR@[À\ðð©P÷¹°º™‘‚gÞ'˜ ÀÀ° é E žÐ–€~ 1Sa#6u¡à‡Pd€.@(Л6@.ÐtP7ÓP¼uöSuizúEyB±‚ðA€ ðŽàPð  ° š®ÿé}À§UX{|àJ€~p(P=¯¸P§p »°»\”f`±4÷1òy°€e„€!@—£ ”‰P + ˆZƒ0”ÝÐ yÀŽ°ç%’+Pd€ [£p°SAk× ú(ųܳÉÀ&n€ yÀ‘€¨€ +Àoðq°NçÌ×öà  1°õ0 „ ‡ð… +³ð¢47)ue7†*ósõ#jÚ#= y`°°:¨#;±ÚB )‰ €³ÐMPðàò£GûÓ?ÿ7)—Æ)à@':Ò†'`Ë Žvá@%¸P¹ ³À +Bïg  ` +æ|P·±Ò&ê€:à=!f®€'cç Qb@t² 9”í("ÈF%ÞÇxhæªu†ê€ ø ' 'æà é´+>A Ü0 ;%+ô¢wö{P”áh?†.ÍÄ;×€x‚ø€ QÒiÔõ³ Ó€ Ý° Äpû8¼Áfx°äÙp­ÞÀ +íÀBt–+äÏ0Ñ~vc +wôciIÖa4Ò °)ËÈ4>¯ÒpÒçiÁÂv;l +Ñvÿ®=»‚AiH;F! ° áƒ X(ð†‹+>8’áÈ‹= ¬@A €zùêfœ2Õ0“ ®^¸À0Ã…frP 5³—S§3£>õÕTfÔ¦UŸÊ0¨2­†¥*Ö*5F9úƒvX­R«’…zõ­V™€0¶o]²qÂ"rfƒK|.ª‘gNÇsR à‹'¥pI½+ó%|ýŠžù*b|¨+Û‰4)“ëJ•e”ªX¡4_ ¤ȧ*W’Íšõk°]ºv…í\±ßÀqa!w/Lj3|øõK×éQìG£ŽÔÿ¡Œ8L‡D§mékkݱ¾<| },U„ÊÜKýåÍkE>HâÉ(Â,Sºµ“ˆ(©èÒ 0q]5—SÁ”åKKí3Úr»P‘Ê9Ö!À=uD’I%£„’b)¼ böðñ 2Ê•_{S]€KÖ‡ÕX^ £Î:朖Z4dRM—²Ç>øÐM<"–á:ç¬Ã9Û0ãŒ8Ål¡ »På 0ÁìøÒþa{qí‚Œ1Èœ’Š(…ÔC ‚H" zq‹-ð¡ÉîÁÌL $t@m‚õ¦™N™’Òe#¥¾d Q€-'iV6ÂEªhšj:ש2e W’¦ÿ° Up8"*¡ñå29ò\ +¡ˆš©\ÄŠ%ìT0Ah“Zˆª„TyK¤P”2J1¶è⭃Π9ê¥E‘‡=@kô‘‰( ˆ‚ɽø‚DX$q„>\" !3 ƒQx±…pm€¹‘úò +'n¼xÚ{LòˆwßUr¢6ô´ À.T’J.^$êæÊ_é.¯RÎ~ˆ}Ã#tW‰&ž@áÉ)ˆ€<0,"J-ºøÂ𨀽wù¼ê£L·ÈÅÌ/PŽ Ãæ‰'”ñ 8B›A&±Ø²hÊÐ’UfÓW-›a¤ËÙb÷X =ˆÿ¢Š)¤DaŠ*¤TbB»a°ÑJ*ª0Ó)T˜ÒÄ(²(£K2ÈX® „€íÓQLS6S0ÞV!$+°+">aܳA1ØÁ fˆPBdˆ‚QÈÂúÌ.ÁpÑ_…~)œðùªȂÜ.·p±…/Ô¿BEÊË-º)¥y-PA`œÊª¸œM¥U…èßUAE $Oµ¶úr‹f¨*SÁ"GbfpÄ„Ô·c…‹U3™ÈF°YQÁz`°X +\ÁÂ)°U(à@*ò°ivK/0Ÿ +ô%õëÅÀ9ü¤Žƒ + €Á¸`Ê]|á 7¸„,¼®1ˆX\¨ 1X¬fÛ¸Æ)ðõ |aÂ^™P„^:Š! 7àƒñ„WˆéGžˆ†8NÄ¡]©1G ^³1ïœèDv0ÃaÀà‚#lá +ÚŒÉË b²PŠƵ0¨€áÐYlbc Ô—(ƒ ìT…F’%i l^*B€YF +~(ƒur)ŠLtg;‚Šx`ÿIþPãi3'óÒY—äÏÙÐ.¢@3Ð ¨Ã$Ò±ˆHȦ¥(•DÄ7Q¤Í)IkÞÊFÕ Ï$dˆ·P"ô3G¤¡5{#|P„g â@":Ã:<ª‹”¡Ó/Ê‘"YCÄÀà`AÌ@4¸ÀhøAõ¢î +¤íp)ºn¤â§Çĉ*ñÉO‚"(耻BÏE á2…,l¡Œâ¸v„bþ‚ÿæEÃŒ ´Ô†l Ç:Æü#ðà Igú>q….ÌVâ¤H>"v«ÿ!= w +Þ!• 3™` |ðyˆ!%ƒ4sV*¡Ò ó¡?² Dp îbõp°‘ 8S™gNh § [À9SQ&ÍV@ü¦Ð$/°"0ÀõK1E +†@HÇX… Þâ4¡ Iø2¨Ð3óXd‡à ‡€O' £ài5ò0•à +ÝâAW*%¥0~¤!3`à³MP £0 37©Q˜±Ld8†xQ}± R ò”`ÀÞ žÿP +ž@ ˆñ@ +ÝRt@¢Âoð2RÀ,U31à‰P‡ðС`T’j <¥.8r˜Â=Ë¡&*)\À +ñ4O#Ÿ@€@0)² ¯ˆi <å ?' g-:¯ÀO¨gÐKÞ1 +—àš ä5ñ<õUµ8~¢¢h !ˆRq ·ð +3 -õ`"8óˆ¡Ð :€€ˆ.À µÀ6W&w .h`5@hè<¯p ·ÔR÷Pö$oå à þU3 +Éä&cØq €!îX¶ -@Bƒ_° P Õ0 ¡@“ÅÐ,ÿ)a@9@ ¶°gb˜Àö*_Ñ&ûõ î`s„÷˜  +49 ïp©#"ä I +ÆÐ ˆ  +Z€ÒÐWÓ.D™”bá]•àvØ.d`93 +£R  +  d#_€­Ð =`Tp—à Å  Š) Å ~#=Ëñc¡ Ç ë°›¥*@šŽS ‹0 •€ˆñ:ï@8 Eà ßxð…p°p Kã ‹B.Á–Ê$C’óàu§Dž` Ø}P~ôÀòeÃÏ +¯ð ÃC=QQ&’”I>Á ©ÿ‘`•t 3ÐGð Ÿp +à!€;d0Ÿ*0Ëà ¯p ‹]ÅoÔ¸<›'*ºpH ‚`hÐu[töÀB±*@rТ0(¶<º úõUØYcy' ï&BºP ±@ I`IpZS…+0zP 7 —‚0?É"é ¿ð ñáDþ&¢A'b_• Ò€ ­À€@P_<Gð“Æp Ó€ +NB+¶Žz¦J"BgcU¸¨q³j<¥¦›¶ +âææ€yoaHCI+Ö»¹œŠmÖËÈ6¸³£"!©žs}bRª\.ÂoCf¾¾¹ACAZZ"ÚØÖ·\1“N$ʘaŽoM’23– +ÉËËhxYǶµÎrrD f,1'››ÈzJæÝÛžO¾*Úþþþžb,Žž†66/z) n"ERB:*šzY»ž‡É†QRRJkR: rH'¯r_®¶­S*§Šj–rr¾¶Ž†tzB®bZ“BX¼P ®V +η:Ɔz`XFˆ( +îëç润rrj¦™¶¦ŽŽŽŽjji®® ÎrBJDGžjGr2,FSÿ€55 ^‚*]]‚E…ƒ]*‚[‰ [E ƒE‰5‹‚ H—“• ] Œ£—›¢*[‚­E*^(E¤„^]•°—[¼5]µ¢¶‚^¿Œ^J‚±‚»—EaŒ›* ((ÜÜ(Þ(Eçç__ í é*_J U÷Z ^]PP1¯ƒ/^0Ø 9•¼¡Ð­\¹qéÒ±P„Ý—ƒ »(Œ·îA&\¸ÀÁƒG UÄЂŠƒ[&(Q’𠺜j„©HÎ[Æq2„ÇðÅ΄$‹0âŠիV„¸(¤«—/RÇ@‹—JÜ1P1B«.ÿÅ kÎGŽR»DRò@!º"[˜àª‰ÁVLh@ˆ%Xð@˜° [>ТD9yG&ܲå… ¥yêcP$o‚ª…›°Úø°•Æ^h¡E @0 ,è` B˜à µe€.ô@ iÁÿkzéÈ'ÿ-,ÀúîCoþù‹›[œs1ðÜ"âH=¸ „q9®xÅ;_Õdæpr-pÞ&Ⱥó‰Ž~T" 6, IÜHJ¬!ˆP È€^f6T°x¥»Â¹÷Á/~¯“ëWT +èÆï¸!@MtÀw4‘Œ‚°B¾ñíy4Ù i&€(T@7Äáè\×5±9 rVÐÂ@ÆB“üY 5çTÀ… ø¨y\Ãâ -XšUà +9à@D‚l ~ˆ{] À¦ƒ;VíA&`€gbŽ›T"NùÝ^•O‚ðc]ô`fHDaÿ ód€¸˜òà*`J„å(1¨ˆ7€b¥1,c  +0¦—¹‹ ø£¥&‚\A†zäcEy€& ò +!hJÀµôQˆ@bI¶†¨Aþµ"51¨|2°A0'8Aú͘>\eÐLR6!Ø=›éLFÁA[àf‰6RƒG±*(Úz#àÈ C@`0{ðajÒdƼZ „à%À6 Ž†À}c+A ôøÀ€Ã3’9b%`Žå¤$ ËØ×·æ­³è›É®ÏD¡ ôh5°ô$ÙþÙ Ä2ÿ`Î$¡„Óœ¦?=Ài%±GÂïîtæGU + ÁžàG8õ£ÎDªœ`᪱ H  ˆÔà4¹éz@#\©!°Y+ê>Ñ‘­yÀ8…¸>¡ #…ÁF»jfNàŽÄൡ@ P ˆp"ÖXìŽ@†9/˜gý#ë.{O˜RÀæêǦŠÖ©üš«j¹×þ5{Ý낸ð.èD·$ÂÕ¸¶€Ñ–—¤"p¦¤Ö„µj´À°ÑÚu‚!d @… `Ár®åækQÀ½dÆ»GðÏz È!”Á$­ÿpEpL¥–T¡œà|Eû»:¿Ã­€8&Š„«š °.ä$·þ!‚8`Ž­ °3Ó»€ +  ì¼±h'x߸†¸CPA‰+B¬>¢GÜÂ<)‡µ·KèZ{e Ìá©¥d1CàÔÿ 0 ¯(+(J a 5ˆ@h‚¬voTR¦20Öœ=¯k¿m§û´‚¯±ó¹wÕ'͘J_ˆAÜô E(2×ò©ðÁ”œàØ` êìñ(5pOPqR3jÊÜÔv†@4Ëh™ê9[nÒcHP€…0T¢ °¦üÝ Að®|™ÿYÇò5at"ÖãªÏ,hÄm¶§µ,ÐZ‡ƒ s.°0*(– 0Þ­ˆÜO°`xµ4U9]šaÖÔex©i`Û°åFö^“€ÀMãa¿0ì°[êtõ»K×ѱWv–•š Bø{À_=skå@É ó98ŸôA¥aO€ám)×éѸvVŸP=­G‹¯u¥ä[¸Mðƒ›Œ!G °ðFÀ‹ 'Aj…lanœFÆ¢(ÅJRê<ƒ©sB0…n¿´ä’ÜÈ,¼á€ tbá/XpN°7Öõqã÷=iÒûÛ@*\:Ø $àÿXºÖrsFúiæ4,ô©¬øjn †…‰®u]ò ‡ûĤv- œÅ"Ä/R€^¥I/‘ˆD(t·DhALÛ̯•­$5™rÕ¼âñü²¡·*¾H_âR€J¸»õÀÂ'¡H† /Øóº…Ñ{nt#ø×Iíɬq¤Î¡z JÓI!ã8Þa9}ã +I±0(åØs@Ö^·ñ²Ÿû*^macƒ“V%ÙÓM¹„qïç à¬Ð=P€6àcÐ<¬S_£µGPY£3 3C@)càPÐm”ÖMIô,ïÐ[@A‘]ƒð€‹µÿ Ô6 Ô?°Ù·"$ðĶXbG`éWFc±ì`í[ñ1â|Bža ¦ƒ…4YB(„b@=`>pF€}_°4CJ´jg1Ñ +¡;Þ@ "´U^@ÐÓ7W :ð³p`\pFå÷, ñmx…e„'tjG%ðº3ÉRKo +H c2  ƈ*@F'”,þaDÔ Ñ~0…JÑï nÞpÏa4Ð=02žÓ6S.$àKã€ïÇ_à™ñãDˆ—‡F/RÒ!#rAîyÂPâP4mdÿ(A0> |é—?l¼(ÞÐZ hW¨ù³Ô9ì‚àÎB%*¢Ð²t3q…?!®Õ€3GqrU’z„Õ +­X%Á¶ŒäA¿³4 Y³%!%ÖH ‘‘Iá +}@‘xÁHïçð1tqãБ‘a‹·ˆ~qh”#‰|Ï‚XY­Q’J±‹ñX"6Ù,·(’ˆôH`‚@7â`•!“Íò»¦“JK1g”X»–ì¡j—99`¶h•’tq’Ké~rSä“\I• +¡.˜r½3’—èWøqíÿá@êGn¹1H¡vØØ=…à°¥“ø’‡ ““¹4K’‰‰­‹/€9¶È)Ò?û˜U­%K‘šuvBÄA–óð;!Q‡s–¹~í0­°œ9[ÐmßðZXåÛ ’Y°P"@å7Fñ1¨ ((ç`q‘/° +†PÔÉ™ôÑœÓÉ™œyx1@Ð 'p pº™”'Ù~€B%˜ƒv@q;¿H[‰àXРö ÔùZðé°4p¡R0'ãG©†ÒØM­Ñ~w$î—DKF0'[èXÀ K7r–3Ÿ [Ò D0ÿ:"P°^Åìð³¤4 Á›%ö;(.• &ª÷WY%ÍÙžX°P@P0"ð;ЋGœ=I¸D$J”(Ií§ ´5^9'Î)¥ŠÛ Lp¥40ð@0Ig I’Y¤@ñl¡DW Êñm‡—”Wg€P"p¥%À¥a°š ù;38tsSÀÓˆÙ…“åÛ€tnº ÓÙ ÀI\šñPgg˜< §©?J”‘šÀ,I`/r‰X§šªPÊAð) pŽ9£¢ 2§¢?š"­e»Ê«²E¡"D£í9¥#w”) ÿ¬Œ4ŸøAã°(ÇNz¨Ð= +ð® +ð·©`Ipª.Úœ-ú_È’‘/Ó‘sÉ•ò`•Ð   Ipx½é¦/Ú­+ŠR˜")€9ÍZ‚Ù¡A +‘ +‹•5à+›„g]*¡ðˆ^µ7;K˜ãƒ +¤›ˆ˜š1  «í÷Zù#´s£.ú Á©)àª>¡!¼0(·‰"T›åš½ó®òzk0\?lŸ²:ša9) •à9¨¸h°2iÙI ´7‹`à`ò™UQ*¾y¶/p¬ra’‰j/Ø(‰™µ  Ùà¹E¹Þ@¹ðÁÐÉy¾& ÄFÁ€•š @À É  Ñ t³ pDØÐ Œpš£ðk‘0”Ð'pÑ'™ µK +}Ò»(п¨Œp¼OÖƒ ž‚!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/07.gif gallery-1.5.1/images/ecard_images/07.gif --- gallery-1.5-pl1/images/ecard_images/07.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/07.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,20 @@ +GIF89aFSÔ Í’’‘‘ÒÝ„!;EŸ¸Ne¨áøØ–MNOݘ\üûù*›Ç®´²ilnšÖ¥QR¾WMLºÞo¦O 2Ö¶zzÛÜØ '3ÂtX“;Iô¸im—¡¶Ó×¼aÿÿÿ!ù,FSÿà²\ŽØ–™ŽB£²î%\ãi–Ë·ÊñÚá²)Öp‰†KãÒHX.$‡Kp5Õe©.š±„@äjqIQG¥¸oƒ˜îø<=Ïïûÿ{€E Jv€‡€Š‹Œ€?ju’‹x x4 ›œw G“©"œG # b x+ v‰ª“ G…Zv%x.–Á}²¤Û#4YPÇØ • v$…‘ÁÜÝܲãàÿ`¸0 Ù£ +\h {ÝðÝé4QW¹áƇЅ³q0ÞÁ±0I)ÿØ“²›¿q˜b`¸cÅþMYpçÐIEútåi`#ÆxGi˜*ÜÌrj# °ŸÚ„ 0@¨dL`Æ¡„†T -ªMœÈaÌ!Ì‚eDS#t0éWVEþp¥iÀÇ´`Àȶ=#•„!g …39Ïìù烟«‹pà™”JRÑ&º°‡W~v>àH€HRêIÊGåƒêŽ\à@Ž“)§Q®T€àËðÉ9=˜€ÁVå朌¸Èª²‚PÞ]_DQP4xÝH—èãÐk +* €‚ûJâCÑÇðöW +yÁÿ~¸°w`Bb•*Ò˜A~_´Ö¼ðL"@qAdx P¤qbHDPÁ7'.2•ô0âH€_ +x°Ÿ 1ÐÀ(y8TctŒ„tø•˜Ë_4 +40Y¬H =BÜ$)=Ð@xÜÊT'êHf>VÍ6®õ!Ahdð¤vSIqb.xÁy°¤]v¤ &gæéAxp\7W¨õ¡x@¤Kî`vD@ÀhàTÔÉs#HQOÕ™žú •' Plà Á±þ +ÊxŒ¼V纨Àÿl€€¢÷D©Apjp(Hd>ò͉ݥ÷AŠ@˜¹¨ÓJ`«ž\;JPÇɃPDÉÚ gR°@“®“ݦâÇ%¤ + É$qùÐj%-ésOc”¹ì§“"0Šj @ž +hЀyÚž»(7ây諬ÓuŒ¶+Ÿif(UÀc§ßRÁÔÉœ,¤¥à±k¿.} ÒßVšA¥Â¾z¬™Ôá·µÃÚE h +M7-Ô3sS-ŸŸ2¼ 3 .œPšôÍKç…±{ÀgËÒgŸ>ÇëÁ±”‚{ø +V7Þa³;i—n¹ÇT Êyâ9â¤=™_ÿ²2§í÷,;E-ößuJÀÁÕÄ{¡®Š»²$¾ŠÀã¦{ü÷q3Ò£úÓAPê® +@¾=šÉç«|B @§ ðî7Ô¿ÿM£¾ÏÜèqÆs  »ê)ûó’^krßØgÿûÏ ÁúàšÈk@¾ÊzB–,°².‹R»ÚÀ&®'¿ÎBcð  € ðÀÛÆÇ#OE@z +¡Ê—ìiW}:ušåÀo äD´õ¶ `ë<+kZõÁ=p„VÃ]ø5)èg.Ìž£f1¹tb†çÜxD&µˆLþ ª6BPÀLøÖ®< ÿ&ù.‰£•püÀíBÈÓaòʧ,. M ÜöDbéÉ|:S.†Æ%²b&X@'ÜE%„ Vúrˆ,ó!«||JÀ÷x¾>qIŠŒœ—x€)ò8`“àö®ól€L×RÕ®v…¬–kß—^u¦ ì‘D<‘Ÿ£† >6N…J,@: UVG• p&“6àKârJa<_¿¾¸/ "À£_rð;RÏxl4)XAµÌšH@ @|IïLl+³òWÌC¦§Lbä°WXS›”"ã5PO>¡/qþâç!ÕiL7IÖòŽµ¯))ÿám+#VÐMó¼O‰ù+åÖˆÑ$¶n?¡§Œ§£¬©ì|®Ÿ.PÌa¢³TMô'8%JÔü! |!„S`Èc(‹€dtÕÕÎ3€žªÓx´ºh?ý¹U®²ñ]¤Àü×€rÆ·+Ÿ/ût» 4À§éÔß\ÐU— +“ItÑ¡@‡üÝaø!¾Ú§2À§WMW‰ÉÕ¡:ª T@µFQ%^àm¤H÷•uNPÙPûIJ~––‘D–¶²+Ó¢ó5…餸Ä#f©S  UìºXÖIà•§j•«ÊX×Öt¡{ªe$[ýe4?5­t…ùàvÿþÛ@.zšN¯¶Eˆ>ݪ? +6M«Ä|-wKk¼±ÂMyÉbìP' +>ÀŽÏ +- +0Œ$±…kz{Z±ü` eM¯‚'JJ t ŠLeh% ÆÆŽ–ºé•g©À¢t—Áq ñmAKA K`rY %{×;?6 +æmþ+¶ÊÞŸ^õÆ%žð1²AÒ¶Ø>Θhyž·‚ÇÝÅqs<ác: Èòýð9Óy ÁÍ_†+ƒm¬ÎèWÂì¬à8£KfŠj™”u¬šd._õËíÔ1Z\¢Ö¸˜î¤8€c7+Y^§—Ûiº +xÁ6¦¯›¢˜ß÷ùÍ€fÿ€‰M¬ßcL¡¬G^0}Ó»£WîóÑ}&±—)½ä8K þ-ó9UןºÉÊ$63¨'(áÏÚÔ^¦Õ|ÕUG·» 8Om· êuâ¶aŽ3¥Ÿ¥HYoºÆ?í@°XБfr­I]AÅÞ¸Õ‰~í0û·Oû™¦‚®µ²M]A ì¿áV0¨©Åk[ÒÜ6öºÛ™Û#|@¨~~ö›mhoýÀËú65·-¹àÛ•=÷£Á écÛÚÄÉnwÝí)Ñö¹±#Ín[Páü¦ðääP†%4A™(Ãdà…+LÁ ]°‚.àÐÈãdð/ºà/ÄAë€"x„¼€, &—©ìÀéJ§ÁA: !0FX@!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/08.gif gallery-1.5.1/images/ecard_images/08.gif --- gallery-1.5-pl1/images/ecard_images/08.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/08.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,20 @@ +GIF89aFSå`‡œ”È唹™“6HOØÌÌj«Íª¼¢ÞþKdpJŽrrÎîþ(.«ÓìØkjjŽŽŽŠ»ÖuºÞ-YGJúýþp˜¯—ÖûÎbbþ››Þ..¹²²Z""þÎÎý´ºjjþ%%þ\\¡—™28Aþ²²VwŽnx~iµäþRžÆÕ×Ø?V]NW[ö,FSÿÀËÅv$cq(éKIWÉé’¸†G¥ÐŸJ©Öá²z½t¨’p}¶D:®ŽÉJ|_$&gÇr-åïz.sB|%KKnBxWrNKf-™™šž +¥ §¨©¥« ¤+  ¥ £«º¥go-˜žŸÆ¡¢+)00)¼«Ö¯®¿¿Ü¿¯ÔºÛœ™¸î븤 /,ø,ö&Ö×P”Êà€EÁ £æ°g…ÀRÖH °‰ÓwÖ‰"…@Ã1ø3µâ€(F)(0 +…ƒQÀ@J +/J-Cq]Bÿ˜ +ð¨#8ÄPñ±€¿¥`0‘2ƒ0ÈÀ"@†z&ˆ‰`…a.ŽeúÉvž{G‘žøðá £ìÁèuÕQR8€‚eÞX"'‘;ÔRhûS€ !@h±a® $@@` +AßR Æ(ÕÁ˜Q–4±"Ba=AÝjÂ'R¨W³æ$ìj†°ÀÞÈ R•A*€.©—^ çNìD  p¤A†E«_¡áÈèUS¸~=;öë~$ˆsçÂÚy€ôQ^ ·Þ „`¦¤† ¡À ™  _½€P¶­5ÿÁ[ö,‚"ˆ@! @fØœò—( +èc–Á[aÙƒBXI°Ä“aâQ1l ä¡—bf-ª×žT¨ÜâN> €ÓV?™¤À‘ÉPpEif”S:,WfÄ L'Q…‚'¡ðKjdœé'‚ Â&Fo&”£&$Š‚(¿p^FPÜŸ”æÅ‚ ÅuÝÂÖK0ˆ“Rê§=@µÛ•meš,³<¦Ý$©©”N¹Ø([±Új[Ö8aÆíY*®-NI“• +eÖè2lâ…ˆ¬Ÿ8ç©•ÎZm,Òa °žtëµQæåÿ€(í¼ú¬?E»B–`Ëž}¢‹à”_û.¼”Ár›«`î±ú’Æ.[ÿÜê +ê!è +Ø£‚¾ìå5–¿ÿR–ІI@Ê +Ôs.Æ d @P±tûÇ?MPÛmŒÜÀ£ ÆÏÙÒ1§˼Äg©œòCSªð*Ëâ-Ì1C¬ÇEŸÒC $mæ”/ÄÝÄ.ÛÒ,äÈ<,œBu*x4\Zgl.EÛ‹Ý›¾zw)Š<¢¶l›<àF%KšH_76³zËcM˜Wü½6Û +XAQÅA ²OÌÊÓ¾:, /eÝÀ“³-ÀB ±`‚Àm”‚[2}ÿšÝò0ìó§ k…ä©«R +pP„Bõ|»Ãñ¾¼Â¦Ôy¿%’ÐöxÁ²'ß`ñ‰¨ô\.`Vþ„(#àh©G[rlŽCß#ná4ð‘°†œe)qÇ)_e1ˆ €¼‹=s’&xfû`fÍwáÐw^ÌÀ/³7É<óg†[I²¦ÓE!îX' +íabÂ3žã‹dÊ€Ou.Rœ“쀠ZøO7ý'†ætä+2IKTLrMÓ^-qA‹‡B4œV‘é?£Њå£&u|⬚"ÿw(ÁIúMå0wPc'60s¦A&ȧ8÷ ÚÔjy›Ì·Ì©L!•¦¢œÛQYM,ž’dëÖ's9ÔŠiåe{;¬Ù­cžnð%TÙ¹°¶Ê¡c§Ka½¨u¨E3ÙH¡WP„ΔElª \±7¼š'€í+ËæYÌÑ™e›$‹¡aY·W[²ô˜Guì´ÙMgœ^S©EæzÉ]@¬J3×Z4¯š †ZÇb[êR§Í°©% …Þ¸*ÉHAh#¡EG­Z[÷­@›Ã +‡ k4¯5·ð‰<öÀ†…4 Ù Eß¹ s=·WcÍH9«ûÑþ,Ûÿ.6­!€ÊU7V +/3áù¯”"nÂ¥z3úö6¸«Ê'áõ¯Û\¿ìpÙ *½P¸W$†*¬ÿ:8¿! ÁŸõh™mÄœ¥ÜÖ?|× +ÄÕ½ä<\¹V¶odí ð +²ÀK­E¿PÜpLjçYz&n уêhÁQêøÈHn!«¤µM" ·ƒÅEr(yÛ— øCZ“pnáQÄHJy¿AÔ¡Y†ô ,­C©]¤Ž—fZÞv ZžL~§ëb듹¤ë6sC‘Š|"áË¿ÜÁ ƒæ‘µ§KtêJ± ßY@¸Õ7¨»`&öb‡'êP§ +™Yà6•`Eö@Q'¢†éèÃ$PC?8Á…"ú&ŒÛ8âˆÄ(±… A L¨W 0&xÆé0Bˆýê0$;ØF@C/!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/09.gif gallery-1.5.1/images/ecard_images/09.gif --- gallery-1.5-pl1/images/ecard_images/09.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/09.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,12 @@ +GIF89aFSÔ ŒŒ‡) +ÑÐÈIJ=ÅŽt§]<ÔW1okdP°­¦Ã°…ööõ¢š•_ULŽxk**Ó7I5*ÖrS›B"ô³£ótóÖÌv&¯qQ+ø\8òrVÁ»³¼1 +þE,FSÿ #:b%"M'*((Ì3M“®ÏÚж]­õvh¢×è ŽÀ€Át5´NGp=º ¨n!Ó†ŠcŠ„ £C˜®Ã~Ïïûÿ€‚‚GTyƒˆ‰ŠŠZ#‹{}r —}$"¢|" ¥Iz• (|1 +££I a– «z…·¸œ"¼ r ¾ r’ +ÿ2ÒS¼rï ÁŸ §mê0À#† \hHoBÁ~%¢\4°"ØàE°À¯\ ˜øÈb<Œÿ¼ë0lHR,èK‚¹°ÍIP*À2ü¬q SÑ@]®E(ç[’ Ùô|ªQ4ѵ×8e»Ðà€_2ðûàƒª‰|Œ@ tð†º`2GZQÊ}¸Va+_ì"]Cà/@S’0È`WjŽz€@€€†·ö ¡‘yb„dŠù„¡r¶´cÖdÔmØ0aB† ÈP»·a™hÞˆâáA†‘%K0à&öX½Èƒ ’sbî„9ó Úç|© mLE¦‚WpäûíáÃ÷¾‰ +€ßÓPED¹|ìø€ +,ðÞ|Ýyÿˆâƒd€Ñ?dH`€ò%R5ø)²Æ‚€‘îåÐ@9°¨b‹rèa5Ó¤Ñ 9!àŠ®@q·ÝVÀ,°€z‡ ~âX ˆY`È*°w‹<` ``ÌgŸI`Œ7òˆ¥‹/8 Ã{p°â­ÄàBÐH¶rÒF׌5€æÜô ôüÒ# ÒxH¸!ÖZ#}!l ¥aÖ)p€ØæHñx%t€W¿ˆ¥ŠnkÈž `wÜÞ@,Bc~pPdÛÉüŸÒ4#­ù‹.Ѐ ˆPçÿèLûñ ‰”œÜwßM3Û' wrÄG ¯6êqÀËMÑ|r­âë›Ë> |«Æœ<Àî/-{Vú¬PC +>qùëXž¡ç²ðÀ+/Gô½L° ÆSÔ_Ú.§˜!Ûn‡L 0WýêW–8zpü觽íxDƒì®v`¬<Ì©’.@› ÎЋŒ¹/µpY“Í. :PA.¨`̃8ålï…èÈ$¸µE`aÈv˜e 6ä g8ïBƒúA唤¤ô•fØ^Æ´'ªYMiIßñ` ?ÿ™u/29!|XsCå¬n{rÏË`€B bè¶è^w¨Õn5PHhcE«½Lpȃج&Ÿ4@lEL@]@ *q~m„¢Ç11ŽiÿƒÂ"£X¨€995lh¿)Pèf#ÜàŽÆ,fIÏEVB@è’ ` Ilå ƒ(G¹èJȼ’ôÔ±ÙYΠédÐTf¤Ÿ6Ó—&ס0™É¼ezÀVH¡@{ƒÀ<Õ«3*(4Ž6FGdNÊþè Ê9JKÈá  à³Ì+>†-›10Ð ˆ–È”Ä&=@㜠ø‚Ð ˆ•ÿE-K¨Æª…Há›e\%}ªa ¨€ 4*ötÆXÄ)kС B”Ù¬ 0®ÈR(ç `]`'20+=1˜ À­;@ó‘ìTHú|ë ØêŒJÏ0Ïü©¨Þ‚To¥Ô…[eÁF:Î q„\„!À0(…8=_RÓscy+ ³ÚËTnL.N1›'ÍÁ-™@XfuÐ`ÓîPWñqS°…GØÊ~­Ò;½+é' p °þOÖÕ Õm±mieËS¸Vœéªrx†(ðV2 ý“%|à ¨BYik£ÿ`«O „ÑÎášÜs ( ¶œ¦ À¤àFlXÀ]UxÌçH€Ê` ™ÒLh ¤-=-c*ÒáÐÍ„ÊMWælîœÁáOe:ŽÕ ëƒìå¡{h! 5˜ýÔ°’XA s~½‘üà<ÐÃHþ”S©À`‰j0þŒå¬&  ¢Jâ´à*€Ád!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/11.gif gallery-1.5.1/images/ecard_images/11.gif --- gallery-1.5-pl1/images/ecard_images/11.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/11.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,15 @@ +GIF89aFSÔ‘‹„r*ÑÑÐÖ‹aEGEtVD¯d9„kVûèã­¯¯EÆ©ª¦Š†_``°—”jJ4ÂœžC+&õÓÍ켸¤wrqqp_I7$ŒD‰`N盆þþüϹ»’unÿÿÿ!ù,FSÿ Ç –Ø%§¤CÐqÉ:>Ê$£ˆòháš È + xµA§&âuÅ@q1’Ç@¡ö<>¶Kᥠ" –ƒÂYRhváX~9šŠN#ÂèL8M" ‡ˆ‰ŠŽ”Ž˜™“‘Ka:{¥M‹¬‡ ’‘Ž²´’œ±“»=  Å€§l«­‹°¸¹  º1œ›wiÀÃ}~‚†Ë‰ï "’‚³7_;»)R6¬Ã(A.¬S„¡›¤MÕ° !Ÿƒ + *`À@ I¯¦„€@àƒ|†ÿQ4áÀ‚…‰4°TaFGÈ( ?80HÀ`ŠN$Ø80àh ÊqÈ6dóP…™3È`]ÆÀ0â› 0Ìt°#ŒÞ=8Y…T«"Ùàꜯ nùÊaÌO \¿†K ÓG¯ž’ò*"/a^`îUà¯r6ðZà+ h¨ ¯6 pPò*]?§,gȼ°'0`a[ ÆQÀÔ :Èغæ¶KáV +ƇԹݼ—a`À÷ÕMj$ìèP\…„(ÂH˜àÛ…ŽŽ5<ª0·ew1Weì7WˆaY;qà€WGhuVÿßdÔ‘l`âÔ MPpÙÙµò@Èô€`àç@–RC ¨Œ6*Äß[•\Õ€OM$ †0@Js5`È@b½qˆÜÁL-b´É–I5’rv½MÀýŒüö¡ ŒdÀ +Y5ÂZnÒJ_L#äã"©h¯¶Ò]ÍA1?g'´J¡ÑÍ3Ðö%¸ +¤ý¢Î˜T Aÿ â•È6ڽȂŒküÆ,Ó’+ð ›ïÊl¼˜ @£…v&²Rä¬hÐzË`Ç>s‡–CigÛQ¼ WOlê*ÀÁ*¯||)ÌZN{Æ€´h@ÁÒ#îAIÖ„µÜˆƒê‹›÷ë°W,óß½ÐᣂK¢4Q™)"0Ú"Šö=ü‰osIJa„>Ëj×3 ;pÀ½V £Fà«œåfç<tÀs©î¶åhï}B¬¨ˆ´î~áã[‡(D°Ža+[ ó€ ±¦EÂ2ÝCÍ Y>°ÁŽo½ŠÍ“@Ý!®$À²±@P€~‰¸Àq(«ÿqœ$ &Äݻޔ­±oˆù‰Tj(ЀH1p‰€h"ìÌewMчV\ßú²¸8He¨]´P¤^õÁãq „ãÞó¿Â½Egnü–±‡Xup^)«ðmŒø#©~E=éòF8ŠIŠñEVLxÌ#¹’›7 Š@\[ ‡KEH ˆd+FsËFâ e¯sšÎGͨNg &f2~ÌÒ2‘²@)øÌûÁŠYg›$ @y"Ûƒ"®r• Là2 tb1LQ¾~¶ì YâùRQÅK^ð…ÊN;®€là.®*£Ab«Šây+ÙÁ P°èyÿ,h>q/q"VÄSÄ8FËKaŠX  „8ßL;QXRD8èÙ +<*CàÛ BKRt•’L[ô‚©-÷4}™,ðД"Â7´ÚRPËEKƒœR•©$•á¬¨vo&’p€ÇÌmé°*)]aCjâk –YU¶ž«öŽã!˜7—Š6%£†e÷xNmí+Ö¸ ‹\XÖQ4Ãj_h’Ážõè‘r…!ŒJY.pQ%M#«½à*ÿ›p'î"ÏíÐçoËí,]l"-uŠ…û° r—C¾£<ͬÊ2u±=Ùw. +€g¤ëÑk^2‹_Ì`³; ¶JEeàÓw»dß%•}Rr+ÚЧ‡XÏ|6¬®“?©2¥¥\<@˜’§ííÇt¹"føÙ , KD㻢ÏwÇפDXº8{K*þ`ºD@WzÇ;j¹À ü&`Ï‚òÖtŽþÙº$¬ä P‚¸»@dQâ[aj.%@•w»N j9ÀŠÐÀ{A² IäTVˆ (‚±™š)”M¶jrÜC$ìË1"’2ZñΫëV&Dÿc•ËN½ +úwšà‹g¸µ Në“•‚ýFøÊO +´–}Ö=9G +‹o0 ŽD”™/«R!pÓú0Ë͈g÷Ћӭ Xt"-£\3I·l>­ôñ­ a— Å+*€! ]@وؕ™¸TyÍVV›–¥µE`wðnñ0ðíVŒ›W; A¯Oî·èÈF¬º[_¦$—$»Ö‹”1Ú4ìûÔ€6ØP,´ÍVÛ¸*¸!Ƨaq‚á"8¹ùݱêªj̇0%8]“¹ªˆÀ@?Î+:œÝ€×U×áexÀÃQ­€@~3,“W}ZS€ÿ8:é?n%V-´»+‰†¶b¡X…Ìoå™Wè`M¼ÆyÚ ~rD@ÀŽ¶ˆK8|׊%Ñ3EÞµ—J˜€‡÷ºš+i”Ô­‚86WÚ`Ŧû’õ#?šHÀF jÐë‡ÿïªòÀÆ r +IÚ.­L°ˆ \cZÝQëp5V, ;ÂUV•L6ÞÈyU(ɚЀ˄¡Ç.p5z#ÜnCy"D6ÏâA–…§"^¬ŒÊ±Œ˜³Tšoh ¨bKlȸÆ àXß6\ÖѸ3[a`ªK¡1K`au9"B"h7#bùÉ•mWžy¯ø°WÅ^‰29&´É‘ÁÀ )H¥'šÂA–°ÿYS–   EÍÌÜؘIBŠM½þ”ZM¯•†XȤÓÍË 4gÞ#abO¶²¥¼v©˜¥¨`qÚ£i£åK‚]ÌéÚcr>ó¶>Ħ,&¦ÛÆ€iÓ&¤å|ÂíôÖ×Jç2ìŠ)ÍŠ``V³O0!y‚œuMÚ[† ’ÛÀºçrÈÌQ1_Î#üåÉÙ‚’´?†G5n•K4ÒUQÇ.Q¡\‹43Š¡–]iÐlÿX"­’¦`"h¢ y%À ~Fž4N?á~ÞÎÊj,]5¢±’dHÚZâh"‚5OŸÌ5G¹wÝ3Æ4¶Hÿ"FxS +,SGB PØ`ŒM§˜+ñaÉ#0d@™(a)êYøœ€uUW—"‡ DÐ*.h°]Ù‚g }&» (£2ˆEÉ’8²2‚2`|£€;Ï}V˜I£Á²‹/¼å²Á—D£K˜œìH#G‰ÌFtzX(M–ZÒÕÊ X`§ ,PÀ g<ðÁ.n×äߘã™n¾Ù¡u«@ðÁ žyº§Ÿ€ò)èBò˜èºà')YØ)€p@ô9ŸxPëxàÁš@”’WáQÁ-ˆUp-Ô¢Aÿž® + À³úZÀpl›g¹åëÁà“Èæf %Æ °Aºpg¦zÞ©í€Ë«ôú½–Ë麭úÚîÃ=(Z‰;Tbb@–j«ñ¥®Z ­Ç±z À¯xÐA ´z€¯,p@Ÿíºì0À·…PÏPR `ÜîÆ@k|A¬–z+¸,ðAÉXð­¬$ 0·\P5·è=H&“”–²Ë+oëØb ëÜý/žkéÊí‚+8@³Õjôç#˜3À²–½­Ø±®ívþ¯ˆW*닧]·x›“0ÛÙ¶Ÿ€ÝnÚ@M¶ÿèCÛ½­‹,k¬½.ÑP`·Ÿ#3ÓvwDa°à¶k)Æ£=ºèÚÂZºè¨ÿ;8Ñ"·ÎüÐ8 ýYG °»®ç#·ž1éà×]úô…MvÀ!£ý6âä{@N‘Ü‘@¯+‡½zâ[ŠüÐËŸíÆCêž72K àtÓë bù™«REƒZh÷½ý‰mgcÿŽW¸1n|åâ“ËôTcÚã–칌…q„•¶p8žNƒ¯R/à3pà[ßBO +T8ÊÊ…9$6X¸%n €0$ßòpX+j@xÀÈ>%)øn[úÓßÐ,%ÃÿâÏn¤Ãàø¢+éMïc ÂU€ +X_ÓF²Á°xÆË¡5–<7þÏnšþ(9f¯Ù»~2“«!®nâß É—È6²O<ˆdÇì¨\Ô©’â€Ó(÷a!¨Z ÇæIÄÝÐ|Ò "¹HZ¹jO’B¥*-°NÕÉezŠ$P:ºÑnu´,Ýá^Ê6Jïc—¢¶ò´€ˆk`•Âð$€ð0jïrÃÿ`(>}m¬‰›¾ôU)qì˜Ç„¤Ë•=§©Òì’Õ@®œÀ`zêÃ$Ð ÙAzêk›l[$$ûõ\„¢N>\ä.uE€‘ÿ+`6‹â@«uòš”ê%7#ºM¥YÀŠ<˜¸¨e':å)` ×Gf!ÚÚ׼T·Tš)MqS„âj•0@-H +Sá<å)Ç­ €[ðQ‘™«O>̲—§ƒ“ZÅ””ŸZQViï›6ÝÓ"y˜´Œù¡M>`)„Arc­U´~NT®•WèDZ¢PJëT«îD§rr«€¾Š  P2hƒ ¨±f/Ž£ÖZù$ÇŠþÐOQýž&ëË‘•óÞPdTHW+÷tJiÙ)¬œ’V2u0™êIidí×Jõ$Ôº+Œÿñ-g£D‚o% ˆuêÓ1éä4láI„q„®75Ý·öÜS” ÖŸ~÷¾©âwÇNµ¬*¾°o|»œâ*–ugam¡š÷t%G8Âss÷ÜÝ"wyÅ%Žï‰ è´îwÍÿ5þÚ`úàGºŠ%žë[œçC¹Ö‹®ì2û»ÜœµùgŒƒ… »;ê"Oûϳ¾õP íîöº¦Mw±wö8)h6ŠÛ]m¾÷œèhoûË'.u¯œébK”šÀçiK=êQgÏ NqªÃ脧õÜÏù+ÀkÝ#‡úÙ§~ð³ÞåFú}ëÎù€×œ9³ã¥>u¤žëA‡|yÎ'¾,è)yéGóǽèÈÏ<î%ììf'Þù6{{ðêó1_~ÚoôfCß÷¿ÿ‰nkÚÛþï’¯=ËŸû"¯^ìßx ë‚מø:Ç>öÛú¸Cÿûàg!u×%Wf~W|ÇtÃgtì‡{_€nbs‰rÒÆoæ7z£‡yÈ€jwœ€b·8rGz ˆvwzºç~ @0n²y ¨€úw|7¨z¬ç{gs%^g~(ˆp(X„É7„šç‚‰WX0³¶YÚ¥bèn¢i—sE˜v龍=˜NßÐWSPNÐ_À€¡3cPfË$k ~, ràqÞÐ=€<`0iI FÆ?á@ ‰X‡J!!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/13.gif gallery-1.5.1/images/ecard_images/13.gif --- gallery-1.5-pl1/images/ecard_images/13.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/13.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,17 @@ +GIF89aFSó 8`__õÿç++Á ™öÌŠ‹u£££¼ŸÍÔÕÕïïïÿÿÿ!ù!þCompressed by NetMechanic,FSƒ 8`__õÿç++Á ™öÌŠ‹u£££¼ŸÍÔÕÕïïïÿÿÿþð½&$SK®:{Î’5b×tÙ³I”ƒšGžáȤ’J )(]#$È0§MFÀSc + 3)p1¥œM2ðᨄpx0›Åå³z­þ<Òìq¾=Šæ ~.< +qg y €}tGRy‰j„“d|‚‹kp^ƒ™‚j¦¬£¢¤Y ¤³f„ªL†´$w²¾³€©º"®Ãa +¡q„ Êk¶ǪËq?q~™–bÛØ ½ld´=š£~ÂåaÖêÖî´s*p«Ó.•­UÔ©“)Ü 6ñ T£P€.<Ã*'5þ+îŒa4ÑÀEU™,’«)ik88¶‰Ú¬ +ˆ qáb¶‰b†i“”žÀ"aÌ)À·ˆö¢)ƒSàDŽE $Øêì§;RÍD +b IŸ^GATq¶õ £l¥Ú*÷”%/ ^E(ÍÑ=Ôp0åθ­ˆ³nÍ NŠ @óˆÔÓ…ˆ•”RXq‚HMÅDtÙÌ®«9zJ¦>ƒX0‰ð"h + š˜ÊKŽž]¬Ãi€ÖØ 4|r“7ŒÜŽý œKÕ×ËèN ÁåïA¼x,°5ô8Ó(@p ½.÷íÛ‹Ïç[Bp–BFSÔI µþ‡À€²g { íÂD7(0Ÿ~¸Ñ2€'g¤Rà…x€9-hÑpf1hˆCZÔu®ƒD‡ ÊUþó1D(‚ê:눕(÷·ïÙ.È*Ã˼ˆš`à¨NÌÎñfp`>0†Ùˆ¨•( 0kKƒÑXðŠkt‘®³>°²3X¥„}Ø#"­UP0"[Ð '¹;?VUk(Þ›$ÃÉäÙKo¤^Ùº‘ “Sp†Pd“V aà@mÈQ„¢ùÀ~> žÄJHA“=” +§/ + Î8ˆvµˆ1]DìTo€6ô"Ð^…œ”%tn5¼ž*wÁoZpc¶¨ /SS…™\3yv¢ 3é®$gÜJ^* Heñ ‰ZTBIÄ­fRbâ(«ï!½"¤³u¯´Ò f¢•ÈÍV6 Ô(¬2O(ΤS'È(€y†žÔªŒùX 0J)«{²ã£€Ê ]s¦ÁÐôzr3ÅJ +a†°È %ýéî1xážJ…bFþÆ +«T1ªl$Ìc* LIb5›"Òz –ìÄœG Âš`N +©0°Â[³°³&Ô', ø\¿:ð@³3xÁ^ÝèŒ`Sa l &` D; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/14.gif gallery-1.5.1/images/ecard_images/14.gif --- gallery-1.5-pl1/images/ecard_images/14.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/14.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,9 @@ +GIF89aFSòA+'g K‘"¦±_LljrͶ¤øôë!ù!þCompressed by NetMechanic,FS‚A+'g K‘"¦±_LljrͶ¤øôëþxJjUg<¥:5¯‘—u‘UM§qr*@hÀH¼ Ñ†}z_¼JA2S¸@C'A žÐ¨tJ­Z¯WÕnÕ à€×+Ïãòw½6«Ïaó€Æ’(è¼~ÏïûMw;x~…†‡| BˆŽ† ƒ”•y C–œ•3@¡‘¢bˆ“¥iqq{§‡ª›¢®¸±hº‡CF¦rs^µŸÅ»a‡‚¦Ç33ZÔ;ÊÃ})«”ÑÇÄMÕÕ¶d؉˜ÎÉ3ßÅÒ*\áÉå|!ˆbúëëïâÅCGOO³|aj=ÂošÀl +i㣰˜«Oïøx(þpß¡T xÕ‚· F +aäÏ£¡A92´£΀>€)p!e¸F:0¬d© '¾ ø¢]ð©€W[ªqáò@‹° ©Å´A£TlÀ“Jí]@*xíªà+„!øÖ¬)Le»K™¦R7/Ë´Wç)—eºÀìd+s§°Áb¨ øÝG ‰#ƒãØrÝ8È¢&ty‹Çlyðø ú…–­=9ð@dïjd¿?Ò½‰›Ú*@Ó”ˆUŠ%],þøŽ®ª@_€®Q–Öh­~Ѓ›kŒ„žk: ‰g¿¡š*b!^Mïh’Ö¤]& (‚°×Z§4eZµ½ã¥I cë—‚–Ô`„•eV¢,yù}¹6œ¸ìãܲ@%•)C†¿[y‹Ž*zúfÒ 1û äR+UIi ‡—jÌ!.< ‘ƒk;4ÊeÍÓŠX1¸8eüºå.RÖ¬œƒ Ÿ +%¸tÑF»pne©í9=6‰l4aêYœŠO¥ä£Ÿ§X´ÂÔµ1o^ÚÌÅ™Z€aí+ä¬kÏã/ã]¶Ù³îcÕ_ì4Ö©ÈÕr þÎó°âØÁšb›™g›bb¬Ë‚vf¡œ›\Gr·¹˜ß²Ù¸15ÑÄôì˜Z,kÏAWM3¼&$µl³–~9™:¾Ã³¨- +è¾9§jº…3•ï¸}:ö#Y!íÙ<7[<Â实 +Ð5fýhšï¹g”GZ÷å“χŽ±o]þ³øà‹F{WÇÚɽ¢¨à:„¡‰pð†3¶D C®‘Ý\ÂòÍ(xî˜VÖ°&¡`¬e=ò`SË´M­äNh3 þ$#Aj4áVêCÓ`4(ïÑí/'Ø +ªÚñ¢¹jåÃÁŬ²å«ƒ<1ÒvS4Ç|‚n6Ãœ<¾‡1}}hõBFÛ+6gA÷E+OÑ“ŠEƒ] ;jŠÏ½î¤ Ëpb”‡Èˆñ¶ñ¸piŒ4$ zÁ: +ž‘h!†\x|Eùp§•ùü±g#$‡@de*E•JcãÐb”(G'³R±®;›†— í1À9 +W,–´ž­tQäš13<’±"¯QB)—BDRzê{yPŒévvETÍA3ØRp);MH ¹LÈÎj€…nBa'Þ ç®‡‚žÄ4 “<`€‰åzAÇÎ$S1! ¥=ÌD°!ȧ¨T‚V)mv ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/15.gif gallery-1.5.1/images/ecard_images/15.gif --- gallery-1.5-pl1/images/ecard_images/15.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/15.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,18 @@ +GIF89aFSô 8` e\^]c`hrŸBŒB”L‡#gŠbj‘ ‘²˜b¥cbßêéIR˜sº–7¡¡¤Ç®µÔÙÚûûû!ù!þCompressed by NetMechanic,FS„ 8` e\^]c`hrŸBŒB”L‡#gŠbj‘ ‘²˜b¥cbßêéIR˜sº–7¡¡¤Ç®µÔÙÚûûûþàuY„XQ”YŽT%¢ljQV¬ªõ,ÓWµÎ®žì$*V|„ÊŒ ±’ +!åsISèu4e­«¬w%­U®U´rh»ßpÜ-×çv¢}Ç·‰Iƒrƒ‚‡†‰‚„‹Œ…„‘Ž‘ˆr>^‡ˆžu…ž |§ ¤§j¡Ÿ™ŸŠ‰¥‹»‰ —Ÿ)Q¯º¦¡…“Ï°¯‡“¾§µ3´Ë¼‚”G( ¸¼¡Ã Ú°î$Q®Ìµˆaá±ZÍ Tº–ª^Eå t7ᣠ™á ã,r  @ÏW)wþM$ë§ ‘5F8˜GOÈ]‚¬äË–7+*.{T¦Ì ”Thððæ aè¼wRWp”ù+ ÐPç +!"R4ðp.)^„Þä ƒJLˆa¯¥F€ $è‘vmÓ\Ÿ~°aé6_ +Lt|ð€Áƒü„ …¨Ìê¦ËsЈs\fpŒ¯Ý#A*hnûh°¸Wkæéj Æ¢ D€aAì#G#Hp0…ÂAgEÀý‹t©MQŸ< 2€G +¦Ò+v¿E‚Œ`‘¥)êj²'…à +rT˜” “‚ À$j1`Ôÿ¡þ0cǤ ×vh8 zëEGPè´@@ hœ ë°‡PrøvV-¥´ŽÆd‚8• g`:°I1W(àôÀJ¶£ 8À"AQ Ár +С¢³d;CuE("Ô‡ 4á_LÅ”d69 ¡4xš#f! šE*1Bx'`Hä† äI&RåT‰)¤@ÊMnòU™‡ DàD:C>Æ€“yê¥MÌäÊUüèTu +å“”Ùh ”ú©“;ý‘!€1pƒ4࣒ú$­ÄÙx™]«uxŸ0ÑøĪàX&²ò%j™5æJe†R¶Ö“ªþfR/=\eÖ u…Jª©|êéì·¥–û$Õ†”¥o°JöÑZãe¦Ò¸ç³¥’ î¸\[ +\ÙéR(¯‡’j—¼{Ö/©ÏFéT)ÃXH"D€kíÖ,œ 7»±®@ê$>þ“ Ë ÐÕžx깡eàŽú1—3V[ND¾­$0½öA9cTºv/®Ÿ¦Ò§µH—¢Ï´y2Ê’ûhT2sÇ´æF0‹“.› å®öõü(n?‹PnØ•[*Ôõ[²&&œ¸Ìкv¨h§Í6Û @ð¶*ìáVp¥d[j,td…Úßl 8uàæ‰Ëôècþ @í…@n Pþ÷}hgZ×ÛÕr¥Ú¯kJ|«>ë#5°¡IÛº#AÝÅCÛb%%1dµ¼·–™çNˆ!ŽH¶([¤2…8° +ÜΞëÐ6ÊØ$J(ùÖNñaßæ|ZV×Jf®¥†›'7±ë"8Ñ,3й‰Ê´ìU+9Ë[áB—ES74M£AÔiÒ5žä«qÑ‹WpŠ5ÜÒ lkhA% +©&Ij\ ƒÖÂÈä€ìèzZÓÑ +°CM‚’È«¨ÑêVPÀˆÖu¼€o6¼Ó wH?Œyê‡7*€æŸ"È烈(€»".Îˉ†zþV‘$ )&àpˆPÓ€2¢`9³à®À¹ò”N-XŸ\pa±H€[à„#td8<ä l +© +(F>à dpžK…xäžF'§èèÀ¶+"ZDg\´•¨²S¬^ÉþQs– +ä<)'n²[ + N°h¡»õKX¸„'Ÿ:›ŽðC++á=z+ÚmžƒjCg*ÆâpjcVºHc–œ‘(i‚éÁþ¬–Å' kO»!æ—†?„ö£5+ü”%PÂ2m#Eý#Eû’Í L W<À‘ºøÓ‘²,F•bâ‚÷ȳžTR‚æBPì +ÀcT£zFZdéŠ J•ÐÙ¾hQuN(VG>ØÜ;nÒ#þmEµ¢§ª€¦´­ReGIå©AÄ}ÄÄ”r‚¨fŠcUZÑir"ï­¦@N !-é#ƒÐ å€tÕE`O«/¬žZz‡¶, *¤ÕÜ xÄ™™õÅÚpC gTb"9ú*˜˜õ–ãàÉlPlô®‡™¡?h9I4Á­æû³¶©%!…éPŒyÐí…Ñå›Y‚ ê÷9I«…5w{ÔœÜ;juÔÒÝò$嬤MÝ€T  Á@oŠ¸F_þø&U,{µ¢Lµü·Èî-€ +ŸÉ¹VAÞV±É5_ðg-N91$̹]äìµí-D%æk“˜fsÃÁ!©rÔ_†hv¢Þ]c•ÚWÊ'üQKrÿ´F·Ä¦»ûÝ}+áÀ{¿='ûK²[®ÕÊ ˜H „+8! 5‚ ª°4h¡ $8F€¬`›ceèÚºð”;@xÁvƒ;ƒÇK:`~ÐÍi !; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/16.gif gallery-1.5.1/images/ecard_images/16.gif --- gallery-1.5-pl1/images/ecard_images/16.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/16.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,18 @@ +GIF89aFSô" .LUc__a.œ(¢U£Ot¡g’º§¹]LãÿñbPÎe˜Þ£k¢£¢À´¾ùä¥ÚÛÖìïìþÿþ!ù!þCompressed by NetMechanic,FS„" .LUc__a.œ(¢U£Ot¡g’º§¹]LãÿñbPÎe˜Þ£k¢£¢À´¾ùä¥ÚÛÖìïìþÿþþàuU…8I’YŽÒtY(›VR%«ªuŸö´Ò.ËÄU9‰ŽÃBaR,ÔHKØÀåsI¦¥u0㊴IA§ü®®=ì*<1†ãåwÛïõ»>¯ßóûvpFKv.‚€w ‹n up v +B>"xo: +žn"¦ ™G}k™x«‡6"« +o¯²´q"¿»"5º€ÄОtÛ¨"³  +"’Öv4YÆç +æ×t›rrÊΦçè%bºØ +¾Ø.HB@Á + +Îcp Ÿ'_ø%´íªAFxð '9è8t³‚ ?rþˆ\t ˜#p|Ð YT ¤-*æ‚R,é hÕçÀPU +4hÀ@æ§^`¨³OO'oÈ¥’vDeQn °Ô±Í„&`ªªGLÄg‚†Áô„Ì´i°B{E­ò&A¹_èPõN‚Ì,å á +Ü»ãÂ+g)ÜLâ‡x¥Ç"äX€ JÝAMÏÕ6¢+Ž­Ø€M&“ÐZ‡8á æS¨ ¢rÇÞÕä’…­iYª…ë "àÑêOÏ€#4‰°ps®€p°`²Ör*€ü:#Ïw¤ HsC‰@þI‚îAR€|ÜgP}œ "Ä~ò€Ç"Wåâ9ÊäÕ”j<•˜ 0@†×  Bô!TÐ!Gr PÀØ)%øpˆ P SzÉ’Pj=ÈbF—¡UßeôñG@fC>`ÍÔô1€à&H°— П|b|DáAœ( dB2ôˆ€."e’›˜(à×ݘ!p4NȉM‰§.=…¦,áEÀÀ, Áp€ p M(.@dµG +û<êÀj=5EdVf ÈW@$5¢M@›¦Î‚jz4B’€½Ü!“2±DE$þ$àNS7 +@0ÀŒ5@Dð…|CNfj³GHRRsÉ*zÁÑJÚ”R4q* |;€ŠßZkœ’^âÙ¥,Õe3 £{À8±”xª4e{ã§ÞúKJl$¢$—z‰°ZEsUz€h5dÉéå_Þ˜T‚•(ÑHlct{—hQf‹Œ¹Ý£SŽ ÇÊŠf&èk2Kð¸ýŽûm›ÈÊÄçæÆy/XPÞd™ULòt+üÉ÷WILÊÛQ§ð ©ÑFÚr,ŽÌ_\J-õ—a©èõ¤fØ%Û‘|KJÀQñ ¢b¡mÖw ¸«#[âiƒŸí"áfÕþ ðïâO/þ¯ÎBæJBBÊæ /D‹,œ=F9ÞÜ5e ´'åïïÀ“@ê A¹B6kÀmKf‰5eR] –XàÉâi$Oÿ­™Ñ M`,„.FiJj®7ÈÀì„> ¹$ø»·­HQ”YÚ_ð‘¼ÑÉ'G0B8™Jiä‹ý"ˆ  ±ùþ¸ÞdAù‘‘4±’{bX` ‰«(‹f,í5Z Týöó;¬ŒÌ• MÅ‘7\ÅYQ0¥)…{'d  õ(:OyÑSü)ãñ8™Xˆ¢ YØ‹úƒ+ìI9Zœd‹Ø6Êë ‘2òa GbØ ¨ ¸#x®·»p¹/~ºl¥ÚÊË;QŒb&`ãlG3Á‘w,å…y´í¬Œ‚Le´¨¡Ìª™ÎlÑŠ²è¾¥“ššt Í•…P‚\8’5 NiJ†ÔåÿbA¾ÆÂ\\»á1 `Î §aøËbý0Ÿèâ’ [¹Ð$³"6øþB1Ã¥ÙÓT’h©$šO$ôdL ÆÒø®‡6”nü)ï\ÖQ%b€ç>rÊ™ /|¤Í)Ó™>ï:‘Ô Ôñ…M$>:#€™¸Ø R°}•é©š1¡@ˆ ÐÄS63Mé§UµÑî +fª¢òn‰¸Ä‘j1¤€ ÊhN™™Máª~Ò&‹ŠÏRr¤Š˜«î*„B21›T¥êG\MI,%lQ/›-?Ö®#èÐl 6AÍp5ê':zzqw‘T¥[m¤P?šêƒFÈÆ‚Z€ËåÊ‘ ÚŒrjv¶ ­¦·”–õôD%Gþ@Ý"”ˆ k¥ÇÀ\Ys¶Èy„ü€ZtWÜ‚t'ÀÒê–ëxäE¨Ò2CMˆôeÎÄdDF[ +Vˆªk]/"È ÆÊ*‹^ÏrùPžäÙ ã|§šô”¯š‚P/¶ÂA>S­*ÊJtô¢X0!‡žÖ¨µ ÛDÎ’ÖÈp&Lå%j2)ÉÄÊróÈÂÃpФˆî·ßÃw©‰Ã9Ò‡³`›ž`1-š´:An2&[ûaI¹Æ£œÇ8åCfðGO“8²eÙÔ­¬˜¤š6, ‚Eä½N]cYÇË‚kfÞ˜p“™å#(2Žô´¦›Eþ,Ÿ1Ê'È|ÆÞYùÈ… €mæ²B¡àUm¡)Ëcó<ì>ØòGè×®.}œnúÎ¥bÀ¦{ÚJ9|D‘á”g­‰å}ëSÁXë…`™Yw*CyåVO¥yYêªA¿þÁ«§e7%·xœ› Öеàþƒ¶hjSÛšß-¶¹Åí†J~bÀï¤Ú¨r›{Ónúî,°nÔ4C~LÜ·\ËÑÞûÍü.íçpmÃ@ ­×:ÜáOáâÞÉ´y¢©áý¾€Wkz 1VÜ‹Áx †°ñu+{”3p9Ç7µË\àËö°å˜3m~·\æ:ãT +@îŸrÔFÒ»ιèlЃ áçb#å¸%óu‹à²¥F¨Ö=œð™ôศÔZ¿ª‹Í°'}*.?qn@`Ÿ6„Ðëp´×uãü†ð8Ò+Ý0;îA†µœ ø(i…I¢›“°„&zÇ(S¨s7 ÀÐHÌ9G­Àï^f¨H_û¡!‡é4@4ðÌLi×f2 €Ð0ܵÞÖøª ì‚@‰}|!zyð¶Šû¬Aÿ¹$þÎÏ  Ü3©R;©"-€Àwyóá½z<8:ÔÐ]ºº !¶P€üïÀAX ØUêáÁœpb€¯Á« ëöHàË~4öªmí6õnh›ã¸&8@¦£»#´¯¶å¿ý‚C¡BkOÁŒÕ.£fàòT»$ —¢FùšÒÏ6€ ÷ö3 m{Ø Þ÷ã9©øá"ˆ‚ðÀS€Ì^qD0RãÉ™ÝÚC°û/9 kˆ0lèQo( +.šv]¦]µy"‚X¨ Q4¯Âö@ø-®Eiœa€ÿ<†îñ` Œa ã2B ¯^Cï*HP ÞÀù¥†.´c . öQŠÊiF¸6LjѹŽœ™ZÞX#~€·K:róÍ4A r’#“GÐ &2QßLòs€7Àe!Š ¼¢> <¡fÈY¤‚¹R^F]Y„*]òÌdŽ¹±M)ñà(¨1Ѐf|1ôl™¿HŒØd„ +dù!Èôb¦eš&·ÚNjó$áMƒDËdVeB¡I~è› h@ Ê)âN ù;‰ P̓½l•4¹Iuõg8@A{XÊ„ ØVòs¶]ÿ¯1“I9æ)yÁBÿ¡P«&ᢘØ7}QKÛüÐW—d„Ä‘WIjuꫧsÄ‘„mSF*@Ó2X3<ƒÁëcN§”=6òx‚ +¢<"ñÅqªà¢GºÚ€KÑ¢à”VCdò¨‡èc +œ@~ÞU1A%T¢ƒ…ɹÔ~>—W_9–SrÁ,¹Ïö.ªØc«L~ž +6…¬\}ÉÓ£°G®Á‹á!z&m–2²÷‹¡͹ º$—}Œ¬åW;tÀ€¤-5lшFl.’¡ Àlý(› …+&†+? 8÷`ELÑ??ÖQm&\æH÷JÝùιmÅÄ"?0]lš;ýçy×{ ˜“½ë½ÀíF„%4á fÀ¬p)ìw UàÄðüJ¡ k(CÞ‡ÿÁ­@„M 0k3¨Á Lƒð ä‚BI„ù†!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/18.gif gallery-1.5.1/images/ecard_images/18.gif --- gallery-1.5-pl1/images/ecard_images/18.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/18.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,15 @@ +GIF89aFSÔ e‘.ŽÌ*¯’eÝ˦;G?ª¸iwX4Ïñ’˱qqn»Ì’ìêÖx´!’rKÛÕÇN3Rt",,£ò-ŽŒ‚´²¬‘—Uþæ¶^K4¾äz’±Y«ØT`b^¡•úýõÿÿÿ!ù,FSÿà÷UœXQŠ™Ž]ǦUGTõªªϧ¾Æ®Êi+Ž¢ò¨`(‡‚C`t +Ï‚ê¹f˜ìµãy<=ž)¡«`¤h%š‚yx*XOIT›øÿ€‚ƒ„…††CK‡‹ŒŽ0Ž“…€nnha|”£h~hhnZ€+¤¤©– +]   . +·£hv»nÆe–Ê–ÁR + +Ò”kÖî ¿ q~J"èé“Ðì8A ž$H¸¶áZÑþM"H1ß»ax` ×.r.ÈHœè°bwÿ \ÀÛÇ.8Péˆà¶‚N¶¬pÊ >õM °‡ÍFqºñ僛nv8ØgÂÖÑEI-•ÁÖAÃ0„]œòCÀ†È«‹Šý‰P@ì„\an@MŸYE;IÀ¸·e} Ò¡|¥Y°“j]?XL$þ×@BŸý±1âÒd‰È”²çóä4:H2̓‹3Y£ÑY6Ú;°=ÓÜáÀñõiÎß¿ (?€A¹ò«hžaTbòسkWn@¸´=YF ùì ˜Hîz:Üg%ŽÇÞ¡¼U8ï &þ4!Ðeí @ ¬ÇÿtÌLÒÁˆÑ4 {d(èÀÊA€„¸!˜ÀÀU$°$ÐÁrÍ1`žyÉpØx@tƒ0 ƒn4•åæmN•GÞ†Îmxã# +‚4|!@ Ãq +\ ¤r P¤‘ H9x$f¥˜W^IL-ë9À0xÙÞeÙŸmÀf˜eÔ™€oÉ­Ñ"d\à$ ÂYx·d â[ÞmRA{a@(y¾e††~Î2%Œ@Á†4‡*Ž9F s9P!ÙYq§q>÷jW4²À©:¦ŠŽÃJ€£± +°Á` ×Áu²zyÿ:€A½›!8@¬ŽÌ {ì³ +‰Å깩–é¢v N(æ*çm²Øد°Â²êìº9¦êï˜Òëì1—°œØˆ[,†hKn¹Üîºäjk0à ·‡sÚ%ðIA3œCHÂÜ2À0ÇÜ/ŽÌy˜ã _GИ^ÓÅ4Ëöl°_ŒñËÄÝœÎÏÉKk˜챆  «ôÖ::ytÒH×ëp˜´î Ð͇J +$…ÎsA…•mgtáñhϨ‘pç!–G$í¤O{‡,ωjBÏ,@|Á;e¦ô€k•Áq¾ùRÂÜHGQ5Êü¤';ðQèĘ $dR;š¢å*#ĦJüœAè¸a4&§âWTÇ!fªŒŒÀ—g^¤D†!/LŽÓTcRN~y¨> |g"‘Ò<Ïès «Þ †APežàYƒÀfHZ"eßóC¾×:ÖNVQ(ÞbË4ÿÇÝá…w†ÌlRðëÇ2€TOAÄŽÖ3'] ,+;%ÉãËCü€TȦÿ”ÄL1à¦<ÆÊ`¨ÀŸB‚‚°&­ +´O;µ˜‘ù¸"úÁ`¢¦ÂtÒ¼˜£‚@@¿0«N+RPû0Œd¢¨€Ù2UÖ &˜ƒØXsVÉ«ÎÒ7£c€WÑ1¢šµ1IJ °SÎ7  cTKE¶®Ú@_?ƒ4Úæ*y¤ái²È®6jûìkßÓ¼êÌ629 –Є'DA  CH°/ø$ ](Ì‹4pá{Ki®Žk<¬a#G +pÀ‚ Ìp4ÐÁ Gðƒ%°€5 ¯ Z@A!!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/19.gif gallery-1.5.1/images/ecard_images/19.gif --- gallery-1.5-pl1/images/ecard_images/19.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/19.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,17 @@ +GIF89aFSÔ ¬‡Rœ øÐP¢K3×”/ÊŽµVNJÎNÌ Dc ÖÔÍ«WxÕ°Qȵ½•/-”’–Ìs2üøö¨l,Ÿo‹\,0iijÉ&rþîu®®°î³;û´øþžöòÊܶ¶zÿÿÿ!ù,FSÿà÷9–˜Aå—¥'4®*äž™šQ&KÕm\“&Ùkæp‰L‹Å±È ‹…ò#2`õºuHœØÅS"±¨(²…B>XÈÖÅ÷àM} Ž~Ïïûÿ€‚‚EIyƒˆ‰ŠŠ@‹{d|“d˜|t"‘£™dzœz–ªfY|F ‚ ¤~­–U¢Él«zMIµ€ + +žºdr¾dȦ–°Å7Í%Ñ ÔºÛÝø½YÂejNqX#BÝŸ  P V¡š<]òIÜga[…n} 4m—;PÐÑOLÿdX…m"7 ûØk’Fg°¢=x@!5*êÓÁ… +Ü H¸Ç¥¾‹Âpû ¬* èÜÙÓÀ@+lÀ¶ÁRjÔ”*hÚ‹^@|bö9;¬Š@"$ o‚ +!;´X h“ +¨Ï—%9‚Á$ÃF‚©¢8œ‘ë ƒ  ¸ Záp«™Ø[œ0×Í'è*(ýq wF»C p…jÖÕ0`ÀLϱ=§þªbè l<}IÒÙH÷Eз¡(HO!½Âå!3R¸ÇËIV“ê‰âîžáõµRÊ à“Ð×ÿ;H5„M"lÂIu¢ ípÕ× *À€rË!ˆ€‚ 6ô@E¤ø` TpÀuØíQCn€˜µO ºÃ¾¹³àè¨P@ …H2Í¡R€d€_&¨ 7°š_î HÀLð€‘(9Jwèõ‡äýHœL€ €äQ:¾“tb f$ ÑŒZ²’8à  ÔY@ ’,% h i@À¤f*2‹n¶<ˆY@<Ú;9 ©)vpjL iJ¿(²]N8€Á§­®ÚêØÉÀÒ)áàjä0a@ÿ¨~TñA:€ê§’6 ®¤¬ºê¬£i´J'µG60”D·~;)d ¬š,«ÉÒ™ +µŽ«»|p@ñÁ©‰00¬®á¦Âl«òJJð)Îêh‘@yL¤ 7ÅăP0íj®dtðh.Ÿ['³â ¯˜£À¤lg|Š¸˜¯Ëš[±G"ëîÍ7ç¼)Œº*ê ¨9ˆF@±¤’’Qs³ÎüîÙ³&;bûþ±¶@À-fÒIß|®4àr«4sJmÎ F@ %ï±€4F³@m&ðüŒ4áe‡9  xÒ’jà³ÿ`Ð$B—Ô‡*CŠ7y +€s´™# {Ó<ûÚ#@⊗Ð_ ßÍ´`T°ÔHƒ}ø +ê/Óš"ÖîØêaaöød@5ô…ü‡‡Žôàvº)‚Ô ðÚF0Àé}0>Ê™,  %À¤š'5°MÀN ¼f ŒiRc D’€?>t€/ÔXÀw00 OsºÒ§*:=@€|{”ÏÊE4 âÀ +‚(J—®$|ò›©uÀ"mŽZ!©üÆ„½ùá "(”$ÈóK`X +°S´ð6+duꀀê”å*Ð#£D¾ÓDÿ@ vË£""ÐCÈ/‹ +*r$âWÌDøÞ‘‡L%ðuSa¦U¤d5ªÕx€<è# +!„ä ¨ /$L[èhׯ `È +Ó<€pÏSÈšGùtyÐ{€üÖ/°æ0«QØæ*€¬Å-b3T°…à€¢ä╨¢Æüf§¨&1hy€4pørHb÷pV`bȃÊ7ŸÁc'iÀï6à€v +ÚV4†² +@f¯g9ƒ ¡sLVû€‡m©RPd4ÀAPò);Ñ‘°€EpÀT""¾)¬Tÿ*_5¼F3Š:RaŒD&Ð"c)žrÐy ®ò\„a TjLÇ‚BV›®n‘\D¤VŠ¬GÙÓìD@Xª‹¡„ö™„èÇ6QãFÝC +¼ÖùŒˆ'=ãrZÖJp ÿIk$~¥Ñ¶òÈ@À6#‘ž¼ØÕ;'Tä +‰·íÕ¨ ‹(@Uµ6î¯zàÍHzÓع֠"ÝÃo’Ò»JÁ¯­§$WÙHSuaÕ„R €û´µëˆÔZÂΕqo­RPÓ¶¢é m½…¸ÖŒB¶¬m!d@Ö¿n`)ZûëÙÖðY ØÄ5ª¶VY®9Ķ‘ÈÊU!ë€ïà…ÄXKŠÂ˜½Òe2« Ö‚¥¢všrƒËξ€%éEÖ¢kײ,.«a3[‰- Á¥½£|ÙkÓ Pé„ÙÅæeQ[`z(hN0 ÄZ×'˜X€k!r„î˜ø xˆˆÿp„澸3–àZ |c7J`‚  …l Z°¬à0Xf e8CÞPq¸ƒ¨`!,`zZ‚ÐÀ³ÐÆ ˆy'PA!D!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/20.gif gallery-1.5.1/images/ecard_images/20.gif --- gallery-1.5-pl1/images/ecard_images/20.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/20.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,13 @@ +GIF89aFSÔw††Æþ„;7²š˜ÐÊÑAHJÔêûy´ãºµ»>’ŠŽJlxqtÞ´°ÜÛáÃwj&+5A10£­´[STµ×öÚ–’ôõù”u{egiŒOK,h˜¾œšŸW-'ÿÿÿ!ù,FSÿà÷%™8™~S×Sšt »Lcˆ$%,Úè6ZÍ^‰D-ùñ>™Fâ‘ , +LéÒ1L.¤× PÄïåA \. ʇ›y7oJý²0<Àd%" ‡ˆ‰Š‹ŒŽ3R•–—˜ 2˜Ž‰Š£o¤Šg" ž®Šo‡ooˆo `‰+¯Â´p\ nˇ8 ®¨ÅÞ kÇx  Õ) ÛžsßÞo`É{_d  °¢•¼N ÀÝ[xáÌ… ~)&`Em;)°œoo àÅ8:ÿ\ÈØ)$3o/|páÃf 6x@‘ ”,1m<&Y™5eñqÓ@à98µ´Ñ(¸¦ ÁíùÓÁ!¨I¦R…iìMWeoÄp PÀ+ÅVŠ@Q@ lm]ÀaþÆe†£„\WÒ †\Ëz$0pø ‡´Þt@Y•-G0`€.4D8à†Îˆ@š­D° ^-·.´+Sh‚!÷áª}‹ý—p¡þ¨+«¼ã•*HŽÖEQDă)æÌkfúÂý°)àßÀN9»|¢ +0êÖ‹ Ü3šþG +™1vȃt¦_"¼üÆÿ7Ð’ˆ<`t aÞ= à €E"TŒÐtk\¸Ó`qHH›!#r•x3ƒe1‚¡Páw3é hPßg#ôˆ…‰B6yA€ÁÖ¢… +VçäŒÅ6 xLõFLf¦å–éÎ,)àvf©if‰g¢I#F4Ô6ÒÉùÀw#Vw¡é=ÐÁ!À‰Á'fà<Ðè ÍTW'¡%®Fq^r¥–g‚³“§’®1izàP35Dñ +f‘Øi3s©¬ô…WÈ!ðˆ U'Þ=ú(xŽžbYݼ*ê0Õž\ñ뱜>:(WÔ6:¢ÿšb aM·eÚˆ”ƈå(;5ãè“ +:z® %²ºôfßnhÚ¼Xæ›ï(þñCˆ¶ú§w Là™ñÊ;ËðÈH)Tk²ÝŠ˜’Ä’;‰ñ©‚,4™S$13Á']@ñ)õ54´[ Z-FÐøªy®ÄÓ%¡÷t`w=ÁWÏÐÀlµ&ÓÄ~Ú!JÀ½!Nœrw-`ÐÁðMàƒçAÿ…HQ&/2ˆ¢· D'@0çmñ> ßÛ±/%bÐÀÙ¨;r)yˆ„a™,ð8ƒÌø€Ó=ƒH°æšlÐÁ(g7_DÖÇq ¨ÄL|i0õ{+&ÿüôK@ÀÄÛH@ Ø@Q Qºâ`Iy˜$€º Ð层p÷²"`/hÀÈ—ºG@.ÐE`" °G„‚9Ì8] мôe€ ð€H£ `à.ä0ÆPx> |h@k2ŸÀÌÀЀü$àøhx +@Rx¾Â¸((@Þ` ÀYý0ÿ +hÈ +È#tÔ0Ú ¤`px€46 Ð`ôG2¨2ÀK` ¡'½î ³;€ÐqG-‚rUZMuΆ6 (`IÀàXW‰K…©<b +yøÛDeBÂøàmPùŠ&p’•˜¸¼KãÁí}µ¬Ä—ËK¬Ž–½„…Ì[`#?Å„D Dà°d.⃯tæ".MiR-´&‡ +¤MF¨òÝ\„ªÙÍK=%œªÎª *ü Z˜C¾ ¼.D/hP‰O>œãyØÃSþ01 bœãA +LàÈ€A6Ààx°ºa DК„%(Á !!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/21.gif gallery-1.5.1/images/ecard_images/21.gif --- gallery-1.5-pl1/images/ecard_images/21.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/21.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,22 @@ +GIF89aFSÄí¨“”6ÕP(G t*¤¢ c]]ÿþþçrõÑÆàmJ= ¶BÓÒÐñ¿¯úéä¡o`\!øÞÖëäâ,#!üóñÁƒ‚“öõõpqqÜÜÛîîîIHIµµµ!ù,FSÿàqp†xa˜ømb“]GW¤\Q.7™Ê§ΆËP€?¬óùà>7‘êbØ|8¦ÁÙ.Œç£¡Â +ãÆàDߌæà½h +á&¥©Š0 0%"Œ‹‹“”˜ ˜›’’‘—•Ÿ—œž— ›©©¬˜7V‹¤š­¬¬©˜¥šžš«›Ÿ¾¹™È¹ +¯+}ɧŸ­Ò™¥Û[¹ + +É:8­ sjǦ Ž¶–Ø®«Ís˜RèÔM ÈC ÷RH´jš§F "Ê›øˆª{§ö‰ˆ@ + /q¸P!- ÿ”ŠE‡C¦xcÊ”qâààD(!jl¡ÖÀ äÁ?ü£C’YwHà`ø0£y„1eœuáLðÀÈÕÈà‚=@›D`À@@A„v‚±ÐÄ…ÅJ%‘×Ip'vÜy5"Ç^z xPzFPÁqj0päGz Ö,¹Á/Qã(¨ä#@‹-*N–|:$€°‘dpG +\À‚¼ŠœsRs‘.)6Ù$SÚ +‚HA&•¦&"–Тשóü…É2-2c%‚Ç%`š•ÆAP”Têù©ÂZ¡JQ-¶à²b‚éÉøàƒ7²ç¬Ÿ7«mNäa‹ÿ°Ä '‚w£²\¨¥¬åá‰g,\àÁµóœZ¬$½p›â« .;£u´^9-žÆòG-ØÞD +N”Š§­L a„Ò˜ zé]逞È)äĵ¦ú5ðª·Z\ÂF(ÅÂËÒاžÖ ‚ß¡Tã×_Ü$†ož@(Åÿ༰%3øìÄÆ­ŒÁÞQZ3á;®Œ2Š°°ÎÝÊCë±¢L-€ߪÚ0¨qV{ò@xiL± QVõo +(Y™ \†5&ÉÓ€ôZUµ•c„q€†â;ry5¥zU¬ÊËY™®j¤G]Ì û¤J6&*3€P8ÛØ®Ôï@`“U:ƒŒ%^Y;Uײ•*ÍÁ¸Ú?ie'UÑ«9/À[Ìœ`ÅÁÆÁ \cÿ@Nq©Wl¶¹ë $¼ +9Yu2À4ã&c{Þðz6Ϥj-\Ô¾¼h†ŸM<@^Ûë[2—?µîtwGXÓ¾Ôœà/EBqf@‹Sd´žãà³ê|# ¼`‚Á'ªY²Ä…^ˆ¿ºI(Z1 +TG¤ +º8aèÖ6ÍÅSž— ÄKW¶Q:¦Xnt/ÜXÝ+‚¶µí<ÓºÓ–’sŸh¥I¤.BD±=çÝq 0Tuþ@íåŒEšê×U\ r6Ü\özßtŽ`I§ÕëVþ¹ Á8É@¼ëUpÕWX./t&cýÀŸªÐðBBš®d¸ïgM}ÿ“#ò7Zs¨›©gW¤¨ÃÁ¬kvXrr' +~&¶ö «cõˆ`lânŽ“ZÛŒ“W@‚Ÿ˜ƒê.ßJà7Ÿ­Ò|Æ…eY€~š•Ô6 µ{ɘ‡E3/ñ‰+}jÌŒŸo-ØîÏÎe'%þÒ‹‹.|S3NŒáçv){ËÝ«°TËe¬fÉZîä‰ã¸6&ÞÝu‹ÚP»¶Ž`I¤ÇE'9Šžiõ£PåÞþþÖÞÏ|‘D‰§œ®`jåŽ>@+`A \¨CÆP†/,$ khƒÞ‡9Ôáy ü †@8Ñ~Ó-Pàƒ¼ 3ØÁ2 ƒàÓ2Bˆà‚#(ÊèKh¢p€; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/22.gif gallery-1.5.1/images/ecard_images/22.gif --- gallery-1.5-pl1/images/ecard_images/22.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/22.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,17 @@ +GIF89aFSÄB +k\eŒ]^ÿþþ³#Ù××–…‡ÊG!Å5««¬q ¦‹Š×š^ŸMA› y1-®3""´µ¶‰v}L=D»fLìììÇÇÈœ°–”hJO<%¿½¾xks!ù,FSÿ Aèm‡8}"–yÄ¥lc–®QÓÄTâŸËè Àm„˜Ÿaƒ‰)&£ÉM¤J~&ßÆ`ø0—Lerñ| bè¦STŠ† +Ï Ë ^€EØtl? +fˆŽŽŠ–™žœž§©¨¤¤Ef‘^¸Ž³{Ž¸¶·”Š¦œ‹¥¬ª©Ê|Œ‰»´•ב’•˜“›Šf«žâ-¦¨T~ÔóôóÔ¼»ßÙ™BVQ!0jA.k*¤XcŠG ³êI”˜¯¢¾G“(!€Êžh@0àaÙ»Nœ\ÿà¹ðBË—.cÒ“ér"=‹{bèà†€‘:4àÂqžàԥϘPk¾´YïÞ¼Š×&h"€ÃΑ (™D¢ P˜Ó’‚Û·pÛÒŒ:•ê‡ƒìÔË‘À§t☖ pÇ}+—®TŠ´vþá8ùh+€B€`¤ p€´éҨߖv»ámëÄtéíü°W‡e~^˜Ðd×w)Öº-Ýš¸iů»Ý’¯€0á¾{,>tPäGDÒP‡Åi + w½Ø¥"É,04Ù Ào“É:0 Úô£ŒøðHÞyéÙ‚Ë77¡”ÖÿV2…¨AQ2µÁ)i9#Ä 2ð€b€$¢‡ ›ÓÎ)xÖ¢gVàÎB£,•ÖIž ‡žÖ!‰%ZàDn‚á‚i½ˆä‚Ÿü5ÓpT†Ïxâ• d¢–"^ $DvÂ$“”¹@™.69MT°t£t"(Ð¥ˆYÖIçœ%6â ŒŸA  < è lÇ’ $¦;”QufÀ€¤0Pi¥’JÚ%xma÷Mvà€ `‹Dð%ó #Š£„òI Eaç­NªeiB‚פF€@·P` %~³I)L’ÂÉž§Tp fXªÿ\[鈖fki–Ür .PrÁ¹˜ú ‘¦´³dŒŒ**@0ô¡íµÖj›íµÞŽÈhzÁ€JБ…ŽÂâ»02ÌJ<a­÷VZ ¹†‡/. A¨žI¨Èe–l²™„¢¹$–óh +ªÖ¢mz~Ž¬*‘!«¬'Œ¨ Jè)ŸÙ"¡B«¼ HÅ,p]œ+ª|Ë©–Jˆt`ôg=\@ç&p.± PÑ„é€@+]¦¬äáÝ°RKŒÌUß²œŒ2ÑšmÉ°À8 êŸAK@dc¦É¦üЩéfŽxË€šéõÏ‚~lvÿº¥&àøØ L´ 8žê¹‘ýg1D‰ƒŽ¿œyÞ ¬ ôd'P@ÄG`xÚÄ?v )]Áç¯<  +‹ò¯Ž(@*æÛcŽ÷ðÃ'9ñâGß:ºÅ ºòx ‹ºúŽÿ{ðž +üPA4Àþ×âOzºÅËê" ¼ÖÍîg¨‹ÜúR§8³©¯PhÚÁ<óŽ\@úÓŸ4˜6ÝÁÎl dÛü9ã h ›ñ`·6‘¥,l 0J …]mµ[ÛÔJøA²}lPp+a +‡¨>É P.2™fX”î*\£2UçC! +qtª"Ù>H<ð‰ph-\ + pÿ\ ¶ðÓÀ:A"M­ŠŒƒ›æ6 JU¨ò @%4…Ê;›´L€ª>PD#¡¥ª¦‰bl<“À¼æµ€¡M>óÐå5Ô +´Kù„w³Ú)Ë’Õç’f +° †$S’äÞ5C”é`èÞö*aÇUi`Mc Q70I&Q™|á1Í´ >LÇL£B[Ölñ'‘Pòk&™×@À4leÈ [‹˜9N$ "$AKÞPÔK5šBuGüÌÈPÖ9pŽów“sÑ×Î4((O‹-,ÙÂ’Ô3 ®mrâ\fÏÂ&Æå)ÉL›|@- `6aA.rS¦’æ™I“ñÿ –f*GOƺ‘9sfÓ#Á”WDßåó]!ýÙB9z&†³g *(¡r2R¹‘Ü _7RžIŒHÔò)¸”¡"‰°ôèµÈ1|¿ÝÈ6yÔ?®dÉ\Ý EÚ³ÛÝ€lAóêdž@õ µ€V ”UÊ6†*õgp[j6 #ŒäÓ`‰7ØôÁq}¬[žÈ¤§É­ró¢.5“3!ØRéÒ{&ì_3;ÊQ*pˆŸ5ÜŸ¼¨Ï +Ïé[!¨`Ôð +Öœd'j·ÃØFà`ŽIÊ"Ù; ôi‡©Z§°†EXÀ‚”ÿhá þ”RKFlûCu$‚.Œž !PÑäBîO£¨Ž– R$¶H÷uØÍÏŒ‰¹á…oÙ|(ÁTø÷•Ø‚wÊYÎ$³ž=ëbM•äçöN‡¡ºïs*Oo.I €i¥zß‘0“ð4T õ¼y¢wà {h3up•z¨k  ;¶My‚ªo õ93xe˜ ”Ž2 ½ïcodäþ˜Ø*Pz¬izªâ ‘õ»60KϬ4낯ŽSŸšÝŠØš2 I†óÊ*¡)°&„Ûð@õái€ƒ a—mšSÏ QÎ1xÔM +¶xVmäÿ¦Ú:[ÛÁí͘Žs3‹P¨eª“ù¶ªI¡Z׈‚#tœ[TF1{ºÐ.'„UV2ß`¶'t©‘E:(> ‚88ÇÙ¶ÁZÕ†š¨+][6#ðºïC›  8.ûyrãÓ1 Ê`‘ÆʾÓj,=3CpV³Ìv}¸Rlë³hÙv°¼1<˜¥²êò +ßµQ:Ü\%ñ7O–i•;ÕÆfªÇ9V‚ÁWà%£·Ä<øšy>³êص¶x³g•\êÈ~Øb¥Mœa¸qfÕ-á ³M£†VÝWÃ×€6XÞ7G’3I0»j*Üc¦s®¦]”‘ZtÐn³Ñÿ%N|@â(›§œç ÓúŠ,ŽN•8vrò®{ýë´¤1aÀNö²cZGD0»Úמ¤`l;Ù qOk{èr7ûFŠ€qxêd»–qÞéý¨/¼öµ¤yb™LþÜ£x§wYübÂêþïò€Ö\¥Ï&ĵ|Œ³¤:ÀíÂv1ËIC­Ï vXŽ5âšþ$¶@à-;@¬¦ç_/ÐÏŒ¤%Ó;¿¦YMÚ•‘¡oÝ4àùÏ,|ëõ[‰TÐÏ~ö±f _êbƒs¦Ð+`A \ðÒP†3¤¡‚päàtz¡ávüAB$`ð['|à0 4 !E€ òv+ÐQ x€ê°Pä; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/23.gif gallery-1.5.1/images/ecard_images/23.gif --- gallery-1.5-pl1/images/ecard_images/23.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/23.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,11 @@ +GIF89aFSÄ_]X ”a@þþý¤£¡°‘rÜžbúùÏĦ€ûí²ïËôÙ¨ÏÏÍL#ó»gBJP–:úà‹ào*-åÇ Úºø¼3¹»ºÝÝÜŒ…V<4j04<°}Pðïìsph!ù,FSÿà0`€x}™H|fv Þ:ÄÀdØœWižQ¦Æø䊢Fxa.5‘‰ø\žU æ`x2‹§·$„à—¹†yd‚ÜW8@‰ª¢Lw`~ùø  ‚ˆŠ‰…‰‘“’Ž‚“…ƒ ‡›› œ  ›Pu©©"A«ª°¨«¨ª´²·¸™—º¼‚ ™'"¸  ’ÄÌ̽¨¿ 0»¿RÑ¢ R…Ð ¯³Íé²"‚R™&nØ;MÑ áã,xC!AÁ¼ªEDAJ€Bu A ͇  Ø0 €Á¥Œdð`ÀŠ"ÿXXi à®—º‘ãaªn4‡©X €(2¥vª¥0l†n-ÿuö1wßéÚ¥_§ÿŽ8f2?B1 Ð> æœvŒŠµydšcš¹Ïð‹f³_"O¢ÞȈµóôУõ~—Sàà ÁgoüöŸxÀh𢠯üñÆT04HwFL÷ܦ±É‘ö<¼‡àÿÚ˜ö¼ý ‰ŽÁË!‡;ô1θ ¬ d¨%¨ð(©i5a*ÓøÀ€ +0€"àÙŸÀ†nøÏ€èñ­€ðÁ*p AêM‘‡)ÝRAYàÇ:õrA3Ž+w6€5 +  _­ð€¤~x¤’$§1 óØÄ)âL|!¿8€µÿ* gzø€ÁxlîtœkŽ¬^åœæÄñ>`LáÛG 쬅 \ŸÖ>@œ@òèF˜Îoî(Gn…FV¦‰#Šx»luHèðå.¹mæP*ûèAh@?DÄ·,€Åç|ÆkÇùO~4 |ÀmÉb Ï*Wªÿülâ ƒÀþìç˜Û‚äs&éµútÀ·ºÌ€¸ðžU!zëó%‹TèͱŽ8“£Ê"¦@–ÄÖ%‘A½6LAYÓÚ6ÁÆ¢ÚÍÁžÔ”^Y ËãŒÓ:ɱ$é²%:Ü­_JÛÜb9»¿Ý³n-Š›ÇêÀƒœsÕRak”ÉiQÿ¯Ÿšù‡R·@Òí¤t›Ü QJÍ]žïó›,I×Èåpô9µÌ—² +÷1_ŸeiL›7.ì‘~Kçèªã dË5P…ª»té8¡²ôšùŒžD=¹ áÔ­@)Ühœºçh2— ˜³ÂjªŸ¢¥eÌjY¨¯¢Òm)XT;°™gmª…šÖkÈŘ~Í-®ed!…«ØjÆ­…ïÃ&e«™#–Š©¹|'ª83Nõ« ý¬\¥÷Ö•‘G6P ªzzKUa‹Ôákªp¦KÃ&ö¶\ &cëIÝ>v\ãJ­+·™TÉI)®19T€lÍn¨·½¦båöØÃú¸ÿä"—ÂRа`ÕÙú5­ÖHëZºnuy‹]—ò–\yçT9ÐÅLõNÍ/¶2C1‘šºê¥î{]:ÝùØXÁͧÚ/æj [ωm}ËÞßv’g†/p•Æá~u¨’¨ËJ¢Kš©JÃ(nï{+L5]îlBýB‹p²›¯¶©m¶/£ñou¼b [íÇñMè±$’‚"´kqQ-õhIMšvÅ,Ö°¾Zv`––\íšÀ¢ôÂc™k¤®­W_p|⺶wÊnÙìì0Æt9­ZòÁ€KÛ |¹»µÝê™[¬´wºx¾jÞé»ö¤%áÀlj+3‚¥èF¹ÍòEÿ𣦪‘ºÐ#ÀÃäå×|Fj[sšÓìçQOµÔ”&—”¢¥V¯Hñmµ¬µ„gTOÒ¸^s®5‹¬Y·z084Î^Öç?£y×¹žt±Û<[ø:1AH¼<®ÅÝ×w¾ó®µ é©êÙ­ncl¬l®Y#ûÜèös­Ã,VÛÙβ&;”õZl¹&³ +÷»õÍï}û;Û»óÓà nú&áËÿÖ˜Óšï;¼ßúNwÅ. î(yåÙƒÙÓ¾i ñ‡¿»á 7WÄ(î}"Æãý9ÊÞf€‡£×wbFðš—›ã8¿¹Î ÎóŽ«õ2Ÿ5°ùà¶S«¼ãHﹿÿA®”™ñ;èQxÍsNð ûzå"ŒÕgÝÆØ…áîÞy«•žt„ç;áwöÖÛS„­»ýíåN8Ы¾õ-‹àp¿º¹uÎñ}# #ç»Õ)S“¼?;àz—µIöDr·@a†÷uÌûžoY³ +ð¬n¼Õ·Ë•È}ït÷G½€îy-½Z1¥ß»¬ nÀ§UóoÿƒRïöz‰ƒô´'f à¾ñkéÒÈêËè'Ÿz…uöàn=%*ƒùŠ·½ëÕý¡ƒ +úá¾8}¤]<õ ·ý`¨ýÄÈá´WþôËÿì¸HáT°Œ°….|! cØCÐp†5ŒÀ pðMs5;€EQgð" o<À;2À.À,€4`8 &@'7ð7m”¡Lॠ!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/24.gif gallery-1.5.1/images/ecard_images/24.gif --- gallery-1.5-pl1/images/ecard_images/24.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/24.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,13 @@ +GIF89aFSÄòßF£Ÿœs,ˆ/ÿÿÿe_^[>%ÖËÈN(£OM:$Ÿ3Íh™naäã⯯°ØØÖwC#±"ÁÃÄ»?/!’÷öö€€a'½»ºJJKïððoooîìí!ù,FSÿ`QD†¸e™y"umÅ¥QÈÁ¥–Šç3º@p™GU¤:cr©(djÈD"åsá@01&`.d8 ¤ád0…°óâéäSYx;s0@ ŽŽ’’—˜  Ÿ£¢žœšš˜ª–¬•“GŒ¶¬¹¼—Àžž¢Å¡£ÃÁ˼»º’°,¶°“”­ª›Þ§›œß©—”å" xn×ÙÛ•¾Ëœ¦ôäÀ€`ö +8°$áÁƒ7|,œ—¢@ +ó¢ÝÚ—éÛ© 8 Ràà ,ÿ:z°Á‚ èà ÂÉ#i㇠ؿSÅH‘*à°¤„#4Dx`!@ >t¸#Š…G`ÜÄÓ§“›*T@?4€'”Ô V‚)7pqÀ@ºˆð  פJ—úùôýݸ£¦„Å™ +¹íÒ% lHú‚Ûá +øè’[_¯žAŠ)Nñ šhJ ™P­½ﺓvÏpœ‚2XÏž=©¶ŸpÀÈ `¦Zj•Pxùȇ ÎÍÖGÄ´gàëÁG@ÿ¼ô|àÔT´–ÀDÜ™yŸ…u  €(bˆº4ÝT¨ +%P¡KHr'Ø`œ…SX1º8¨PRÉ H ‰™“Ts#tµâz V@"•í ¤7—8 –xÀ=ö€Ž—€Åc{V®gå› Àià(à`òˆÀô¢-U! ‡’g„jh¡q&ê£8 å‚YrGdÐAy_…³f¢oª©œ~´Šf¯hÐA +rqhé'¸g¡ ´êê«®VЀ¡Š®GݧÏ%` n™&Pë¥:¡³++¬³ZëtŒâª#ù9`”ì zèÿ¬d ÀÙ:l§[Úé +4*W¥¶‘Òž°„jën·ë^¸Î’Ûˆ¹ð….Xé}Rí° ¸ËíÛv[Á·mÒÙ¬¸¹zPÑV¥‰øË@¼¼«1 `¼hõ:„¦ËIÅk«-ÁÙ²œí¬ßÎë)h Ú„Eç>9m8(Ç[ÁÆ{œêÌ!Û›Î@@”÷ü3ÐÚvœª­ÌvÖ +}%4-¦G'Sœ1Ô/{¬0ÈšëÜ\1t [Ú™xoÀd<õ ³S36*R@sN{JÅñBm·(‡D3Ö¹jà·8qÜac<ö»B_¬ù(„/Ìø+a>aÍÿ<š'ñG–Ûªå¬Ç‹8Ñ{ò€‘þ¶é_Üz껿ž8—ŸÛË+ ¾Sº„ïÎ:ÅD§òy4Å —Ç߈£&‰3ßùöÚÃ^46ÅÍ‚\ ÄT|épŸ>ñg~øæÓÃë៸mžsµÚö¾ŸÑ ðôÊGÀFÄO#ó +mZñœþÕ¯€”ž,ÀðLB³æœúU‚4—P“ºä„jÍ-Ê÷µ¥09 çQBÆd„"L`”ž&D!LúÒÃ—è ˆA"—¸ÃPð‰#+I§HÅ*ZñŠX¬âÍnÅ.zñ‹XÄkÀHÆÿ2vÑ "HÑ‹R(Ä—¸ñ‡mä¡ÍxE¶)çŠ\€p€>ö¢{ $¸Ç'Òˆ<¤")(@¤\Q}ì£0I XR +À¤6ÉÉKNò| %(A IQ†R ð›P‰ÊHR’’žÔä& ZÒ²“Ÿt%9JSör”æÃ9Jb‚’¯Œå%3ÉINÞr“–DQ$‘ÙGd“š À¦1³¹ìà;­Ô£H™€”“’½ˆe3;™É\ºr”ïü¥/ù„²—­ †%ÀÌIÖòŸ´…%ðJj’r‰{t¸b G‘9B\‘„B-N¬`@æ %VdP²ƒ`Dñó…O 7QXd#dž-J4LãÅ  ¬úÄxbØ)ZUø²… ±bǪ]k5¤Û²0Ó²µÊ‚îÚ…^!JÀ€ÁB_¾€1l¼¡°‡ ‡=(^ÌØÃÅ7îàƒe ˜3d¸°ù ,,œÚÂÂÞ¿«.Ì1âÆ’ËŽ-ÙeË0kÈ°›óçÏ®ÂôèuàÁ«['†yñìçŽ;tÀ­[sçÏD—ˆXòô„Ô|þ·v½2mŽ?¨_?[º{ê»5{Æ>ÐD ¡/0|7žðxòÌÕ–{~ÐÓ]ß|ÙYTT-|÷]qý‰g€Œ=§zëP zîI§à‚¿½Àv÷å'!áWžsè¡z3θÞ{¹Å×™h ¥PRv|QX¡‹¯5&[‡xÂ’L&é$ˆ8fvEa¡¸Wh~ iá…FÆH£“L†Ù¤&H¢ +mwbifyœ\f£’b‚0“wÖ¥ˆ¹ÉwAT 1Ђºù&kx$’aÞ9£ÖÉžˆRn&Ü@?b ä¡ÊuÉ(ž†é’O–Ùgg/„SHj(`ÿDšÇŽBÂ!äšë¨6¾'埫âh}½šœT&ë— âš«І ‚®6¹ç¯K…$¨ÄbÉŸuqBÆì’¶J í¹çRk­9¢*¨@µÚí_Bf°½ˆ%{à€ÍJk.ºèêJꞧ^À¼íuå°›†‡o¢ÉŠ &¹ºl±ºO—Ùg7$¯¦Ù5|,¢ÏI®³“ ‚Êéæ:0‚|ßBÛš6¬¦ÆiÖ©mRüï¹$tË!4ɧ|¢1 êv„rûqÈyf¯½–Uv ³þ¼2 *° ‚ +,ëZôŒ÷¦ƒV`ZhOCÁ໾W'igÅЭYþ/¨í®½æè™h«¢XjÊvÈ›rf/fU×ç¿z—õ *cŒà©Ù ´„TPN·º8Ôpë<·bÒÑh'®[ × ™»Lv»ô­9³Ú¼7 ÈÅ¥¾ä<÷ü¬Ð*¼Õ7 b“JéŽ̼@¢‹‰›.oÈžÅýxÄWO.4×,”ù´·:ŸàŽ …–K-D :ò“¾¶ö ¿í8o‘»‚´*ÓÛ×j76즋È} ùUàôÃé´·=îqfx°Lëhô,€iÎLHk(“@½à t è$Ø4 +2n>¼É ;T.ͱ«OƒÍIÈ€—”…(þL¡èBw¿šŽa€!ÿ8°A»ÙéuÎSôv8¬ªb +UH:Źð…R‹¡7¨¤p>"¤¢â•fñ[¬^%°CüYÐqºabˆBt¤éŠIÒC¼ŽB"éiÇì(Q72ÄM»Ø7@Rt—š6iÈCF ˆr\$#xG<Æ0fØ©¤%CWLïŠ àd'³¸EùÕO”£¬ào`8™n•¬l U ‚¢S–‡ â6yK:ZÒˆ¤L¢4±ó»gŽÐz |@šb"(ó˜œL&p€ÊÑš¹¤ :ÌOf±?ñ\ @Oo‚s–ã$ÿ€ŽÎ™ë ¨±éÎemõ¤ç7‘ èÓAô'*ÐgŽ®•ÙÌ"'R¥  µg,7‰} ZLdõYÑÔ›4æ6P‚4¡ßŒ¥>zRZÖÒŸÿœ(:IW½¾‘“  §‰HcÓ†4§pÀIg™R•†rŽ]´FªQ“žÒÃH lúѧæpU?ùS ^´zpÝâ!‘ZOXÑ>/à'YZÏo¢õáL&[ÛjË¢ft“sõjRéùÑm¢zmêMÚ€’¦™‚(a·UÊò«Œýè¶ Ïð3²’MhIp€{"6™>,[þø€²"u±¡ýhiåINÈ’µ¬ª-ÀÒ:RÄRÕ“Z¤í“˜沣…DòÚ[Ô–õ¦«ÝçBeiÈãÒRœ^¥gL¿ +R›ža("§u›ÊXá`¸€*fa{TC‚V¤¸5/t·I@½§ý-O€÷²Ö›Þô*w—©Ñe*6¦Œ¥l]Éù_õÞ§$3+À7\Ýê¾7.jªÐñN¤¸ìN!«a}@ÃkH„K€ájxÃ/vèbïóÆŽ¬zoüâÓàÆ0nqßkÒ„¤$@iÁŽàcø½<qˆPc7Ù¡úd2—½æ.sùÃZ¾rDŒþâ¸ÄTƲµœå_ùÎxγž L`8€ÇnŽ Šåf7ï¸À†¶³–{¼è+3úÃŽžsŸÓ<éB[»…I¡áléE{šÓ=ž´¨%]àRóùÍŒ¦s¡à–˜(äÒ°õ§ÓüèTcyÖtöô›/Ý1ŒÀúרƵ°UëM«zÕ«AÏ ÙÀt–ìF{úÙ^ô³¡­lls;Ð=F¾­ìlO{Ø0@ °h0àÝï6€¶  À'P€¶ýg7/mßÞ¶±«­ëmŸÀ0X4 âÒ‚ðX°Ã#"N+»cáö¶¹mñYw›(8KÂALÿ³Ä%'@IX°€} À X8 +.ÍjéºÜÝ6v¿7}îÄÜä#À»ï}.@Á³ßm•·`ÈÎd›qíN÷é:i +­`ã>I °pLÅÄ-`·ð‰cÛ9v²wþf €Hߺ›Q …¯êX¸ ü¼á€È¾ýmÅí8{ãÉŽ<Õ+÷MàÏ0к¿3ÏpÀ'@ÈcHœh +ê·Íß‚@ÞßÞFöÚƒ €Ìë½ö/¸»>²(€í-wê½>üÕ+ÛDöÈÆ«®ìÒ“{׶ï6ä%®úw<$Ï.ÉÚM$îŒþc›î4qÅÁçè€ @ù³›Òpx¾ëëh׺¥ôUw"-ð÷Η/ý¹ÿùûå'/w¿G ×.Ðr €a1`0ð.y!ALv‘'pý7~9Ggæ'z.€peçyI'œ×ju!ËÇj¡--×°Ço;Gmr0Ár¥Wƒ—y,!w™–qÝFgp÷4Xz'm€FL÷f 0_§ÊF¡~öÓÕo~–m`‡„Ÿm |÷1P…s÷s+ƒnÆFælkÒ‡jþ§k«Ös‹¦/Á÷Vga_'~l7„ôxWy«ÈÅ6ƒw(~$§'À!ˆp%`tZöl™¦}‰˜‹è|a8mŽøfãGm¢˜ˆ€öo«‚ˆƒ­˜„ªf… hŠœ†Šþ†^‚Ò·‹¼Ø‹¾ø‹¾ˆ0!4¥)€:ASU¢4£ñ>ñäaÑ!Œ÷‘ï3(¢]PqañâÖ"!n% *Q+‘Ñ‚%Žæ¸Ž%Áæ¨*)°' q-; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/26.gif gallery-1.5.1/images/ecard_images/26.gif --- gallery-1.5-pl1/images/ecard_images/26.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/26.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,20 @@ +GIF89aFSÕ +,('$%+'6:604. I90ID8VH5jP;GGFVSKiXJwiWofSWpqkggutkRhV9EB‰qW‹yf—_Ni0 bˆl—Šw‘†q©t¸Žecx…u…Œ‰‹Š—“Ž¨˜…´©–££Ä·±Ì³’ÝË­¹ÓÜÏÐÐÐðÿÎëøýýýöõôììéááÖ®°°,FSþ[´P!A ‰!\´0Qp`E„("† !R Œ!BaŒ†[\¬èPÅ@ ..†Pá1Æ@ +Œ¡‚š1¬$ÈÀdˆ +.?²,´EcT(á""%ô4ÚPBB6Ee™bÃ1 ʨP¦Â”"Sª]ËV¤Û²cͲÛv¡Ë›-$l˜`áÁ… }9àP"‹†f±¢1cÇ+?~™…eaF#E "@e(° Þ RO¸°z„ |¥8‚×+“K©ÙµX  ð;)žß.iËNFÞ d`¨ï3ç]À•¢oMº .%˜úÀG.EÒV;¸·û–»Ýô-Á¡ °y ÿùçð]+ߢ`~ù#`80š{²¤¦¹Ó™Â Tüý± _¯„ª  +)ˆ ìõ#ùõÅuè‹ŽÐ6)˜ vLËßö>‚,©I l , p€ü©k ËD ð±õe5õ@PŸZ]PeÌFª&µ„þøS p€S ¬JÞŽA=¯>0Ôjc`ðÏöf(H-| ¼R IÈ5ó€git,Ð>‘!˜€ÑŽ””aOƒŠ¹›Õ”MŒ£#Ý•N%yä>mä@êêCµµmU”¸ètœk<"šÕ€0Ñx\+c©—4²>°Sؤ»i-@‘"XíP–¤à\ç2y$r;á Œbà,ù)/H}ìÓY…ZQLµúÕ­oÁÀØ4‚³¿D§{é +aøDJÒ Îì!åÎbò—6z@LŠT€,@}M/RÖ™ÿ\‘p5&ìȦBšÌÛ±À(#"†2æ4¦:E—´s™c²€<ÙTÏk5“ƒA‘ð‰¦" ŠÄ[º2Ð?ä”-ãš pÆ„.@ ØxNTl€Í¤`é­Kit`@%H!ЀØe V›k€IQšR<èŒ0ˆIäè—™BOž_¢€ëô³(+úJ£?* +š ¬- | +È\ÃfTNb"KªòÔ(­2‚X•^±#°ÉU¬EºÀЬäÀ&™ë¤F‡P·À €G&¤Æ ¤ÆãVÁA6¢ e_ ë~>ê€ ò]Íò ŒŒ×Xs¾õ˜!©— þ,{¸ˆÍ@M¶Ø$4Áͧ@µÎJK@0€‘E¬R8·“kE$¥ª’9ê>q¨®])ÀwºNR‘òXQ†2pÀUFLÕjû—¹“ºVp¤K¸³¹>À²@@²‹ÀH3V® ˜¤Ä T°n€° aª”zØD |h.1ÿt¥ÃW$.I#†Ø”ÛòÅu€Ç¦ ÒÈr`ûIÓ`o®lˆ-[„]K£öÈ4($XTÕ—/Ê…€y€Ç>Á™š˜¼õ( :™`À¥JœR™±[‹H€Av¸ HÑñÐ7†#^@lìƒQo¡Ø:#¬þ\€Õ•­”0€#>×IHq*6¿X`aŽM¨G^TÐQÃUÐÈx€ +uuW²’„M8ç8wp;›ˆ ö¬W£EÌÔÂ@l°C°ò’@Ö½—< »ØF7€ ò:%|BJ;WÇRkÁm]Èg‰ÊSÌ£>òÀ.„SN +qWrtÅ`ÚÐ%tFÂt­ rLæõÖº×4jB§é£Ì3TQŹR5±2‚ó•¸6H@®Eæ@"=å4§Лö5j6u¦Ù…€ÔnÙ (õÕËFN@·ØǺ[tÍ=Þ@ZÀÐMkõÏí¬¶=j“àŒ:Ò‘6@ÿòø±çÜJe@nDhâðÅô¼–Ç/î6Ú†Mlt>èΊiOŽÚÓ­6 xuÖ*à'>ÜÎ{ÖK[ÀÊœZUãÔÒ¹"+LôçzºU¤ÔJ¾ëÑ%¬Ó(”šNÇ pg·îk­ÿyÈØØ¥vûX #dßEãV Ý‹m{9]—¸@~¨‰(lš˜õQë ï è‘ž6Ϩ°•5½sF'r +ï'ó™œ">£òÒ¨×%¶1ãúšglb÷yî=ìó!êáÓ‹PÁ¿‹é§?UÛa©Ä†*òë; è}Ñ^‰ƒØûÎ&fWUj®‡W@¶þC|¾”EfòÛözkEpÈòÚ¯qê6ΧùKÌž +èXó±ÝÝ$Œp\A"ØY}ùe3€Ò”oöÁ·²y{¢HJu}Ø|ïåTUö'ÝGD@"a‘#¶Ak’qõ1òôkï4r ˆ{acXÔòGgnUe¥‡ú. *ÈWoð”q÷ò1Õ+GCrC·M0³È5J+˜N.èV‚'D§wqeS·:l£s:èuY+95&Bçà(0ÐGÈt¼ç\"]â1ðv2+Cw8%O`fu{¢'Ž" 2&†×÷ E@ïåX"VeFç`¡ÿ3ds·ƒý+ÄbùÈbòdÏÓ~aà2ð )€b&ñp}YŽWò¦*ÿÕHù(ÿ(M d]¸!©FqŽö'hB@¡4&!Î…1ç°"‡èÇ6dt"¸õ4G!¾â,0í(}xx’1*™1`0°” 5qõROèw4‘2€86‰m°Ö6Y© `9Ñ~ §bL§ PàIˆi>!$‡ ––i™P•l　á0À•^y–c‘9 1vD>I0àVÆW,fÈ¥•™™–Y”"H-lS1,à< ù? ’U/¨-@gP›Ä4mõˆïf›¹©›» fÿ6éaà‘É Žâø‘˜ U”*à+@:&±”üצÜÙ»·6òó™ã9ž¢©œYçùɣЩÐ-À’n%WÉs*P™Û©›`t¯b•<2!GâXž^9i&’')%õ +`·†[iT]…4]!oõÚæ‘F.åb!1´+±R  "%±]+º´mÙ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/27.gif gallery-1.5.1/images/ecard_images/27.gif --- gallery-1.5-pl1/images/ecard_images/27.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/27.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,18 @@ +GIF89aFSà  ŠËǹ®«¡êèÕÁ¸©MJCß×Çoka/*`VFwf —Šýüö?9-ÔÖÈ,FSÿ°µƒd ÁÖöXiÄÌÀÇ40Ò° Á•§,læÃKÀB(<ŠÅãAÓP5 ŸA”cÈ4Å!C,$ŠM@ñhh?÷ÃÀc„Âåˆ + c uz D‘ ™š…‡ +ŸE&Ew+‹"fŒŸ +]‡ƒFK‰O‹uŽwEm‚ƒ†C]i‘ I%˜ ±ÃÃ¥u²ÇØ@ F2+ :Ó–@­vâõ]‘— +@³`_ –È’!7 +0°$[½ +ÜLDàÅ–=;ÿrÈ¥9ºá‡G Síš`˜ÀIƒrÁ¶’`˜­4 +5@,´RŽ“&$Iú¬0µœ‘n 0ÊÀ¨À‘ n4$£ìÁGÔ;ɯƒµ×$å‘kÅ]º`T3kt4pÓD¦®òöqlØ@í'M’ê­qà`¥C+†«ÃŒG€½ ##?pF±…`„î+§-S&È…a× XJùPRg«”¶^ˆ¥.úhá#B(mÓÛ‡R„ˆVçá1¬$# „L|âPlMÔ+ ØG}hÕ¶ÖX:lÙqˆe&Ìÿ/]” $×C 8ð:´‘Û>Ž Q <¨EH`Ä#Ë0ìµB€˜Ï:hó©y%ÂQQ·O=Ã0xVH=z|BMª` Ë}Ü ñpE“2›jÍè—Ùd‚$+ +0Â@AxÐåwí1 JGXGHZ$ÀN6ƒøÑÃ|qB´ˆC%"Ä*C,PÒ"à¸W—a‘Ð{-2’- $ÐN] 1Úi¸ÀTfbÀ]¤4’?ŒøÑŒLíEF˜Ê¨v !Q̧ÀT$ÉŒ@"‰@ Ó6L¾Wˆ)@žÝ€[ÿ«-\Ôªkä#‹ º ƒ@—Bk,-duÀ¹°+x¤‰²·¬€ˆ-•Â‹G‘ëÇ-ÐNOOh£˜fP– 10Ù F¿”„¦ŠtÃT"’ÊTV e …Š¬-›Îáµ¥Üqgdé€Ö‘*¢÷ôe¨"ŽG=Aš mà·ËáªË"‹0q?‚Ñc ®OPKÞ^kÅC%p”"‚'”¦0m@¥œ'ÇŠÀ¸_6¥[¸Œ„ãX²Ã5 ·„tÄ4£ågFHXZ"Ë^<˜d†8bÆ]ø-9p}Et™#Œ‚ÍÒ‰8Âã7AÅëj>ôt‹Yà(!ÿ!•1R@&1~YßÊ• ž£H7ž:_jˆ¡½3KnAsÔ”Eª)#µâ§e^̨Ð,Î×b©CGiCÒåG•†Ôøb€cZ…ìRÀ¸ †:8%®¬TFY€õU.¹àb‚TvwûÂŒ€r»<¡ ˜„ø¹DXbPÁÑp$ƒÄéɇ/REFí‚:F ÚXuˆ˜( U£iÐð€ÒÐZøÚ‹.¶w†Hä¸2Ae\b ®u‰¶sÂ6Px¼q­a•™À@›14c/¯’£—mæN­ˆ‚0„q’CÜA_‰Â J.h¦(%g@à¦P(ÿlo$ ØGe±‰;ôd?ÉñÔu#àH¶¸eD±Fñ#ÇÃÓQÕŽ!ôb xZ¦Æ€(ÿJ—ä´4’J]"@UB Œ˜@ùJC¢. #Ôo\úšR(ÓªÏ\âkGØ‹¾F4¸R"Ó•&+‚á< +!ŠH†àçC_ðÂ9Ž¢¯6æ!@É)Æõ…VÚ‡ aˆ1ù v¶ +e¨µ?ñÍ¥ø¢®ðe9"&  ,ö 'ì2'³€CD!ðÙ¸òÁ€q‰¤4¬1„Rb.A!¬øÚHØô%A(g\GaÁÎp;!dEÿ'Á@>((a˜a¨ ×¾v-\£1÷{˜,nÒÅ:ò g8áD +a‘í.Ðe6’³=ZLîsmBÛ’-¤z胮 …ÄÇKyûÄD2a ‹ôe0ADñÙ\4,`èÒ-B€‡O°Éf¸Ð) 8¶•g6%C íy‰CüÌ7ƒ^.ê2‘Ê8¡žW K‚ tЕ@@J£6u‰ä8S>"ÄCQÙܤ¹”ãX‰û´$­· Ü|0J­cxiSâHQ0R\᳄Œpd/+†ð-IzÆqƒ34fo©GZð@2NÄNÐrÛzP@~A”ÿËEÞx’ÎðBº+ øξi B¬D$hd‰¥hî²>…d*îæ3G„VzFBKWŠ!ùk[ ÃV˜½ÒM+7ÕBî!…\ÚGV€’ +ó¹1G²3~4VYI¡­€ûe˜ÊÀb¨¦›4XÖç&á ¹—C´ª[’/¢›Ï[|i cN½ngÀñæGH±#€4Å`SH|íƶ"„1pEMäc„¤À±ƒ0$JØX‚mQ¹pqŽNØž.,¿Ô埨ù ¢ÐÂq0ù â:dÜ‚SØB +‡=ÇÍœV¦À:/i=èeí|­k¹ -HÿehÄ<Ç +ìAŠ î"E‰IAá@aÛ—ÏëðCgÈ‘‹mB™DiH %-ƒ>:f~»ól÷Zc›KyÛ I.5LTÂi ‘F2kÂùèͼÛf抛áÖ)y(¤á3±ÁžÉí& ’‘,bCܱ©±7ÑE/z`Õˆè¬ÅåËâbbxh»Äü3¥Ì¨Œ¦ +©¾¯?~N¬ÚÆDG4Úoìõ ,¸ÉßR%R/‘†nMÁÅl½J¿KM…º00D¿°©¸C>^æ"•¹D¬é_aCZ-KØC ùçä˜QT!»³áV°t@.Ž€âe Š ªîÿu/Ì¢,X0 2ÖU?¡š—¸×ÿDq@eVƒ+NmÓA4#[W›‚$Ib záRî–?ÊU$ a*¶c<»QL0ã p¤>g±º·[Ž„2,>¸(´¦W! >੦MC…á$á%à†Rs†bvVø"îæR€” ùÒvàCÁ&TÏ#c€»`À~ vX‚–% $À}v7™Ó>DÖ zm6"Gða9x 1¥v/ƒhYkh†mÓ>CõF bSxâyÿv· S‰%až§i²õ<ø\vø õc…Cäö,ešÚ0GšNæ«a‚RB•bån_Ø^‚Ò +˜0dB–|)ñ9’!…™'‹¡šð àäHp,œx9mƒ‹caBPmÓð´ˆ2²Nô6Vðtjþp3… ]uVÊøEÜ“ +€'sÑ6ºÓ?±¸[H¸rI@ÜA'¬qŽÏƒ‹©áÇÍ…"ñ9™ÐGaè|H>FÔƒõB`çKod‡wƒ/"‘ aYDŒãré9š‡/8$/ã"#19b,q¬ø<Ý1yUYpŽÝÈؙŠi  IÈrB…/‘²É÷W)£–D†µyãOo¡,-‰d‘PnñK+󀶈ƒ#…Öm¸2jïH(-%Æ &J@Eð[0b°‘¡4\ا,ñ1i¾•ãT6èOqPi0-ð0O#@¾ø‘pÌP(8Ù1"3°K+å ×!þOptimized by Ulead SmartSaver!; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/ecards_eng.png gallery-1.5.1/images/ecard_images/ecards_eng.png --- gallery-1.5-pl1/images/ecard_images/ecards_eng.png 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/ecards_eng.png 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,34 @@ +‰PNG + + IHDR´7S¹O¶ÃPLTE½\ÝÝÝÖÖÖæææÎÎÎ÷÷÷ïîïüüüÆÆÆÀ¾¿Ï$nà c—K¨S¶°³d4ˆDì*ˆá&yó/˜u<ÎKˆçO•L(òÅá۰Ƹ•¤óR°íŽ¾É®ºö5§ñ•Ò¡s‡{E]ön·0 +É7vÚ¶÷Ú•ô­ÞŠkwÙnŸâr±úMÎú9¸üìõú¿ùúsÜŠ1Vû’ìUnaOWE*5¼r“f/EÒ2‡ÛÏÖô§Í¦HpçÚâÞÀÛß×ÜÜÕØ·ÛBAtRNSÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ0UìÇ*IDATxÚíœév긲€±1Æ€ Ì`cÆ0HH IH²{¿ÿSU•$K²IvŸ{ïY}×:þÑ«w„5ÔW“J‚Òïÿ>ð /i¿Ýé¼ÝVªÿüÉ–¾i[Ó4½ ÿ=¤Ãÿ‘8 KzY7-ºN½QbÏ2©²çÿ+´õ¢Û®³g9]­ +VÁD°ï³g—ÿ d—I½?\ÿ»ò<\Fí¬¦ÿëâÀˆ0x‚y…=ÿ·ØBxûtxÕ^ð9ü-hëE§Î—ÑX}¬*ÚR· A£Qj4õþô².Xäú2õ™þvúEXyk§Óg/ÿ¼ÌÛ ˆu¹ú"3H»þßP•ÃtÒTz«Om1ëE;#ÆžpS!jÕW» ÆåúìÖÌ 3é5ð©/ÓƒêöGk&™tÄ>€*Æ”,-O©Y[]ˆï*Úw`ÄÔÖRïvT/™¿)5z··CMNFëðó'Uïù€4‘§68¯ø±C‘°dðÌSd%í¼»nå'c; S°ÜNÿÖøÔÜÓebQÐÃm¿«+Ic¿>T¸&v;c»Ûïò=A›v5(%?Jä:Ss™ ø_Ê2Áé¬Ö±+°N Z¿*•õíúª€.Oob&g6Žûï·È´åLÛù µµõá"W®eÑ¥µ¾ßáÛ²ë"¶ëІ‹6 ´ðž«Îa8‘’ëßòæ:uµ£íãhéæÙÈ ·´¼¬MËÏC[:¿—h„°urùJ¼1ü0Œ"ŸâdÊ9ìææUê=¬\j¶‹Z¿†“þ-s£UÍ«§é~6¹ÜKõa™vûÀ°õe›[£q4 0í +1|àhÌ¡\&®“§$î¶á#ÑÜ.—ËßR»¨Jœ_z‹p±-w9{v¹h˜’„ì hSAÌ>8œL”^}ö‰ (qùï.FO9h·Bæa4˜wñÿZ7¾5õìG­×í¦ÆÖW~GŠ~øNTWFScXçeh?¶.W=ÆaùV¯÷úø@´¯Þ áÎYšàÞ2êK˜Y¿²˜GœÉX5ÀƒðóAxÜö‰Ñ€Öâ.h¡áëù­ã«ÛðÃSÓ²¬ŒZ²‘áhŽÙ$N”ͬAŸI j Î4Œf‰²sÎmœ˜ÄâîMÈ%<ÎÎIÇçYP'ýXÆzW&´)­2[ƒ­gMÛð¿776-ÄA£ß<#0zào~+êyÛæC·^O›¦SþŒwËz#¼Ùb{ÖzÜnšvÙ¡ÖÁ}æk¦)†ƒ;ñ§ð¹üÔ £ñg®ëªk©>b×3åzBö[§&Ó/ø—ßÚ •Ã¨M-3Xcõ>vlöj…¦&ý)Úw¶bCd>]wã?…"óÐÊyœÉnq¨Žl¼Å=I†Y½#›;4`ðK›mÑærºÙÂü­E=l½lk°w8\@ÑàÅá Åç–ÀÚi¥‡Q½ø­ùÆË>²ê·ž ;keÈZÛÄ–­eÖzê–®=Aë¥6m‹4ac=Àô@—Ž® &rDšzf€Ü/ œ`$ÖMÄéDÐ:Yb)6=8#2µ4æþÒ>H!"këzk$.ëï}]pV,v=ìvQI_û×Ýú€Wºˆ'˜I¡Ñºú³6#Ú¢CêwóâñuÄÛ -…-wƒ›g…{Ö=€<ú¹‹0ÛÔGËdcÀƒ´Öæç¤Þ($ÆñÌfB ^,ë aFï¸X ­õ;hŠAøšÐ[q·ÎtjË?‚ÈÓP‚ÄŸêúqA6ÿúKÞ-í™ð<ÀSfðôÜ£õ=ÞU2³ ‡¶&µ½yÑ‘Ù_#4?‡¯u8ÁÚŠ˜$504h}6ÜÆãq2;OÀ Æð4³FÛ^?N˜ AkC&)¤ +©VZÄ´–¨#&c²T Ä!§è½5)Aûgh#d¶i››£X4…ÉCTèPOÃÇ”¼@M—=¹c’uMÚ\—šm§÷w-±j +´5æþl‡Fà ++‘z ²ññìöQšmkº¦V~†f4fÏ#Ó«a§ê\œ!@›‘´²•T+kÍŸ—¹I»èéý–§3£µÜÕu ²¶xµ£Ä5ý%{­j¾±fkî”Ç@tŽL ä„ÉÔÎÔÕð½@¸Õ×d§QYì˜Cã³´9…øþ©Dn“uÅ5©¤lsÄL[¤ã©ÐBhUqØ(›ÁM«èç=·;»µ¾]¨Ï×=¨@M}•ÏeÕïî`:m b›¯¤Ê˜!´pVæÔ0w 8e9Ðå景\|q¼ïCŸ¢jc™~ªJ-S¿VÞÙ–Ëè[[…gŒ¦v$àÐ^Þµ7íîÛÂ-ý+Æø6—ÓäÏûý‡fÉYeÐë‚™­2Ó 1CÓdüŽÙfëfË|jëƒwa@{‚Èt³±¯?Sö~ëU›5õ[‘`æyÞB[Á8GèVBÐv´ò;@E +4Ì3{—Õj¿#\Z´[Y&´!ìçš™“¹ÓO°˜àEãy¦Æ¼æÝÍßêÊJÌX¯43 š£¨1A³·"¡ q—qóâhkÔÝc0xц1n°8Ç?c•‘aS !2N”ËwØêØê¢u%¸CªæÄÙg¡tδÍl6³®ÉÔZO„Ø<¢6sÌK+-åîÝÌYÇÜ~•€F‰¢etÈ׶@êh¬)…"8átZKSø÷=ÕGZMÇ€æIC!ÄMN"TƒXÿ†Åüd¼Ú‹ÊD½·:³7Ö˜WnÕaSŠÍƒ—ΟÍoˆYI´ÇøÐcÏn·ÇÚ¶±gÑǶ"ˆÛ ôçy&5Ç…'¯V#hµÅ¤"®¡¹-áY¹µ™þ +'De–ø 8Üւ媾_â×éJ’cÆ¡ýºgÃùÏF¾G½r`í·MSø¸ßíÐÎӓК—A³¨X„ñGè’€†ý Ë ât.#SÂeÚcÔZk°É ˆ—î˜q6= ½c£Ž%:|¨×ƒ¹ðŽ,U +êF«?³³à ö4˜Ó´uS›"…š„†¦æ{`j° +Ak‘¶ÿB dîêKÆ+¹š^Ûq·£ò +§YÒdƒ6wTÚŠ,-9@| +·z8ãÄ + 7ðŒð¹¸¯“dÛ%€̳ˆáìÈÌ‚VâÐ<w·¸ÿôJ)Hhä¹^ÞGN~Ÿûá9´¦0˜ŠçÛ·‘ˆ ZÑy0·9´ÂÖ Ûk‚wL3}‚Ìv&^röTþ€}¿Ùñth èP]›@QÒß’€¹äÐÞÐ9Ö"ÁúÑ̆¡¼nÊ\ãÆÉ ýz,†F–öùø40ÔèÅS¡qA!´hËÝc‹A[x÷-  d¶íýš–Y"Ý89ŸggÆ«¦ c9**VËÒ¶íw£,]7‚0¬,…á`䬕ü#B¸ÛïÇé$IMW÷]: aGÛ»—Е»h›Ï–œC«¢.Ý<ǼȈ¢¹ù°ur. à­Œ#ó[,Æ©ÉÊç^™yžù† ­s­>´*å‘Ì;êÐ, ͓и© õ«¸°ä¡¡ÇÕÅøx$C?Ä|f»5®tjP‘,•ÚòêV-ÏŒŠŸw÷°¯Öö(ãՎ奨3,ÌÓ§ž€6Þ dá¼™ez™Ç4²Úm~N0Ÿáù´ía‚†æ ±V ÌiP„´Ó>üa ЂËmâ=?ÈÃb¿¥EdðPAÍg›MKC,  QëiËâ•R.aZ5Ì{Gl/Ðf*´`ÇbÓ©@C!om‹,»ÅÖ’4©»ñh ›Yû´å€wü¹¥nÛŸžˆ£d¦ç¦à¿"±yWý>]fþŠÐ¢6›m~p¾&–’ÎØ4É •NÈÓ@«Â + +û˜ŽD,‡”kùaS¡µŽlÔ:/ž=s— XüÁ Œ^h°L÷ š?HÐ%ä[ÙsÛÞ1‹òÔb}4öî¡A÷0³àƒ6ì™ +÷‘‘åä%–žÉ|Ì^`š§BSÃ>8ÖnIDFQ€¨R¥Â`V»øòâQ©jìÚm#'üh³'hý¶8¸öIÎn´A³eN<Är±?wŠ =‚ŠßÔl§ßt$cvˆÉ’ ̹_Ú†ÌÊš¹ê¸õ°ÄꜣP±E­˜AÃÖA²*˺“‹Ge­¹êoEKY‡!´ñ÷T4¨¥ÜŽÀ“B•¨]Z9OžD2¯bÇ1Rµ‹O/rlÜLbñ‹ö˜à99ع·‡%L2h½t±ÐdVc@»tÑ3D[%ÕË6×­ëУ-³ÂÇÕP}ûÀMm¹åq;0ËeWK΂Ó×àCäsÞäoöÉ‹=U„f-² êCö¼ñ”]0ügG3‰¸æ“žnpLl¯¶³Woº‡­ù&;ƒí‘:LÈ„)÷Dp +Æ»9æ¡•áøaÞ Ï71Yûs+î5ØœO5OÔ¦TŸ »&OE>¶óÊ“¿ùáV4+~S¿9g:3¼vú â¶ÿ*M”Ÿ¨SÛßÕKáóçp›ÉÎcW2¸-Ú±Š“¿?äšÐX¾Ò€Â‹ÏLc¾­9Ê"IûÛ²ñq›ÂÇÉYÜWd¯`îŒwKê(<ž6Yá—S‹³ÖíF-1B +×áþ”²4 Úg?`ÛÈ”˜ó‹¸#”;oœ%p­%ÞÕi5l‰¸ê¢œ†M4Õ:žÆ7V]šm¯ÄÄ¡ÖqÿâEQËÙ-ýSÍQ6ÀeÕÔúmÿ¥™¼µÌ’uÙ1pç^ …w)F3ó2¡å™eÐ,;NγÙ,iÖXY Ú϶˜—hC»3æOÍæÛ8';ð°3ݪÐØÔ[©”Þ“YçÆáв˜F‚1Ôƽ€yI#˯ÕI;öø|†ÅxúBduv·ÄSP2£¼#Ê‹t÷„K†€y=¥ÄÏÅÐÔkæ¾Ód"ÛÌx`Qd‡Î] +ï­+lø´ l~>¿UhR&Y†eܬ!Û#j3[¾Ž=´‹—juÝ`Fëß×™ ›Ž#nhÐp¾Ìn—Z¦à4MK1¯€Bщa='IŽgVÖ¡e×¹líN¦2ž­@SäAŠžA+s+в٬é)§ê©‚rAŒ²G ÍÑŽú•°*…e'Æl š* í¯v6‘vVo hrsí–3‹ªñ}TÖ·*Q¥ëü8ÚUQÖ€¦ËH‘ŽÚµMMËËeã²¹“Q“ÂËñ—)\m ý&fͲ åiÜ@’Ýê +ªÝΪyRŸS~í‹+¶¬+†Ç3TË”ÑUjª†¸òçGªÊ ©˜›ñy·Hx…!£ø+û%Ãÿ”™T²ÛnþÑuZýW9“¿Æþ›aLágÂÃáUl®ÊLŸ™üC~¾~Z‘[1eT­fs» +¬àÕjN®²+_ñRªšÿÌRµ@ž®ú“UE8†¬Ê?=ŠßÈ“­Vm2E@oÐáú$[´¹¢3ÇÀø‹¼ôÝüÂôéòÍ”Í y9á‡ß+?BS2¦•—Š&5fsb4QØ‘j2f«1]ÊøF¸¿:·ü(šßº¢<Å?ÔSÔ£k¦Š?ƒ¦kT¦g†ð¾Õôo~…®¨{uUU4Ba«9ÿdj’[ÑWGŸ®¾Vš9áªÆèµZЕ1½·ïuô6S@?0Ë)T‘ì*9Ÿé~¯Aê×wsýWpÌ?PÕQV+?=UÃÑW¯µæZ~ç& ¨©ÖoUüíb~4“oçS™?{ë÷UáUþ|>¥+‚ùÛOþÅŸ„z¥—?áNòûÅäTíú¿þ[«UÞOó)ýÓ~Ÿ·ZýOþˆpõŸõ‹ÅÕ?[ý?ÚŸŸŸºÍÏ¿Ï‹IEND®B`‚ \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/eCards.gif gallery-1.5.1/images/ecard_images/eCards.gif --- gallery-1.5-pl1/images/ecard_images/eCards.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/eCards.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,28 @@ +GIF89aP:÷ÿÿÿ"  '!*60:jcs @3qys‘s\ýeTúwjûSFÿVIùYMþWNòULéGEÈXWô??±UWâ/2ˆhkÝQS¨T]þQXÊ€†â&+c]gïA[lþQeùKOi #Lmú9N¤?aÉGxýJtêY„ýMöSìCqÝP}æ@€ÿDƒþG†ÿH„úLˆþKˆùL‰øKˆöOŒÿ,G\5F .g`/bGNva'¼i4Éw=ÙƒFêKÔ„ -˜V4›Z?µk*rEH­o +G5¶d,‚J;ªbI·q:ŠW 7+­VV.Vè„V½vQ&.“IF´d]ÍzX«n,!d+7ªS*X5#G?°W6†Hdé‚ )‚::”L#H*hºw.IŸWjå€têˆ4d<' u+kÕziÈvsÃ/E2L²YT´`pã~yÔ„‰è”QˆXGtL^™eqÜ|kªq5_ºffÃmwã€üÊ_þÐgËè§(ì¯/õµ1ä®Aô½J÷ÃUéµQýÎrýÓ‚Ç‘-ן8Ø¥LõÃeõÔ•¯x›kÚ­b¨u+¿’Næµkç½|º…;ÂwƒVŽd.©‚XÇ›jŒpU^2P2jG0t>KA;ÏuIêg,È[*²Q%òn4Ýj4ùv<ìq:þ{@Ñf5÷y?ðzAèv@ý€G³^7å€Oø`¢<ÆN®E‹6™>x/3 H òh.ør:þs<’E%ö…TK,n$ ‘3„/ýg2þn8‚&‘+ +X7,^WU $  ÿÿÿ!ùÿ,P:ÿÿ H° Áƒ*\È°¡Ã‡#JœH±¢Å‹3jÜȱãÂgçðyéº_Èú‘"É¡²e·dCǯ¥BP:uòãG§ SI9‹ËÕ,f‘îÙ4؉%h @9’%K™'RžÀóãO'@>SæëUªWª€åó÷i©@PƒÊ¬áS†™/T¨àMåÊ•;vÖl±¨0 žŸP9û5+•+³²t¹ Ém§1z¶øEc7ï2yôè!T¨Ži7‹Y²¨N£Mèb>~õJÖ,V̬´Ù Œ£-K $¡ãåî—Ñ…&]’T©y%KÏ/²”èÏ2\´bÉBk{•-` Øÿ$UåΚ%I¨!: 5cÆ`Úê‘#EÐ+õ©~¶«V©Ì2Ë*¬ÔŒ?É€ÒRWD‘„NDH„8† "d¨¡ =„qX(!…u¸ÀòÊ-½Ü2‹mÎRË=À€\„g_äÁÙ$t¡LàAxÀ ìd×ÅË/±ÐÒ⊲¬r r´Ñ=$°[B\‘Äz‘¡Gh(ÒcDàf$Œ0B 5¨ð˼K+½£Ë0¿Hi›*U +cÛ!ŽiÿPãÌXÑLF´Ð"ìö`7˜T@® 608ö€*ð Z¼ÂE¹@‡Ø$Ýtö sPe)Ð_ã¤ÒÇ5®! xÔð…Æ4¡ŽlÄÃyä†7Æ@<‡yhC% i\+HBL€‚€*è.0ŒSœË È&]èàR€*ÿŽzÜ×zÒˆ<ÍávĶq½F7ÂAd´ô4ÅÑ= Ár¬ˆ0„#AE0 +BP07I1€a`ˆV6.´Aı<àñJÎECð‡|á1Žo´cÿÛ`é7Þ*q¼£ÿÀƒ(A Gx¡§¦ÙB†Pd SÁžÌè`àøÑ&í€Ì Xƒ =f°ãzfŽÆ5‰Öqt¯p¶F6¦ñVzŒcÎÀs(8qEb w(D!® „!ôºÈ7ÂD'w7¸Û< –&AtЈKOô¨s4¢‘k¨c¯¬F7j:Ï¥#¶$ÇYÙ½· ƒ8"‘2Œ)Aèuš`…C˜ xÓ†)ðd 8 !ØÀ -`À}PÂ>ôT¼#½éض:¬¡^l€ŽêXGÆ£¡½i°ùÿлŠCàkø^ò‚o|£¡H0ÚÔè UºxÀžÝt`«‰PÃÊÿ!ŠeHc羆÷°AîЭöÕÈú4ÌŽ~¨ã@îa&ø! Y8B^Öî/$a "Ѐ$ÀáÍ6èAzæ~ d€HÄ 5{ØVÔàF!Cgm¤C—Õ€4˜ñŽsôƒF8€)P<Œ¡ i(CUÖN:dA jˆ»VÖWÀF:Z¿z $é“0‚®¢ x|‡:<Çm’CÃèÀðŒPhI!ž8Ò€ö#Xÿ^@²P…xßà¿ÿ¼@~/xÿ@ ÑAˆH„‚ Ç0دá«CX÷Æ2òÑ~ˆàýQ +Xð v,HÀl!BЀ‡VdhVP\°û‘˜ -#Ë Zë°KùÄ ÐÀnü @ +S$¦@ÀL pp`SkWsXhv`ø}` àJg¢Pö_Þf Ðà ä@ +¦P„qðu‘À É ‘ Xp O†bØO/H i ƒ0 °oÁ ’ç 'Çø yœ·¤°._ׇm ‘Ї€a0h°Éð„¤pÿ( +çÐ+ù€Ð )ئ0É™0ƒ^0¢8ŠSÀF +pè÷àp™80™ <ÑH‹ºx†PÀ ‘€6Q +?äA…€hqXPUà…‡Òø~à s%p÷ ÐPv °ÀRè°X2¤È¢ÈlÀƒÀbPœ Ž°û` @q@d + °‰ÅØ Fðm  ÉMP_ÐüR€ s°úÀ°Š  0 +ç8Ÿ0 +Äø|#bP^pN ùæ€Tàê¡“ÀŒÿ‰q€…_ç Á° P +  +Ï`j€ ˜p€q eÇcàe˜PàP°‘3Žð>~ Y˜ b· €ÏPž°…c`~ÐP3Žp˜P +ðnlÀ_èXÐŒÎXp0ƒ`0ó~(= +j  `?X rÕ x0’{I +]ð‰RÀ£éƒ™ð l€¨8`Žù˜  JÐ}`‹`oàƒ|` £ +÷@ +› ™° ȉÈiœ©Ù|£0 +(™Ð‡ðEŽp—0 ÷ÁhŒQ + "Ø=@r ê(ŒÞy¥pmY… +` `#¶žöi; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/icon_help.gif gallery-1.5.1/images/ecard_images/icon_help.gif --- gallery-1.5-pl1/images/ecard_images/icon_help.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/icon_help.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,2 @@ +GIF89a÷cœkœï÷ÿ÷÷÷ÿ„ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ!ù,S ,  A À°!„ +˜Ø"A†&j¬x‘áÆ J 0²âB‡)†<éäJ”._¶$‰R$Ê›;¦¬9¥Ê u:´¨ð`Á„; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/icon_square.gif gallery-1.5.1/images/ecard_images/icon_square.gif --- gallery-1.5-pl1/images/ecard_images/icon_square.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/icon_square.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1 @@ +GIF89a ÷ô€ÿÿÿÿÿÿ!ùþ, /ý H° Áƒ XÈ°áÀ†<ŒÈp"E‰/.´H‘cDA:̨1¡É„; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/leer.gif gallery-1.5.1/images/ecard_images/leer.gif --- gallery-1.5-pl1/images/ecard_images/leer.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/leer.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1 @@ +GIF89a÷3f™Ìÿ3333f3™3Ì3ÿff3fff™fÌfÿ™™3™f™™™Ì™ÿÌÌ3ÌfÌ™ÌÌÌÿÿÿ3ÿfÿ™ÿÌÿÿ3333f3™3Ì3ÿ3333333f33™33Ì33ÿ3f3f33ff3f™3fÌ3fÿ3™3™33™f3™™3™Ì3™ÿ3Ì3Ì33Ìf3Ì™3ÌÌ3Ìÿ3ÿ3ÿ33ÿf3ÿ™3ÿÌ3ÿÿff3fff™fÌfÿf3f33f3ff3™f3Ìf3ÿffff3fffff™ffÌffÿf™f™3f™ff™™f™Ìf™ÿfÌfÌ3fÌffÌ™fÌÌfÌÿfÿfÿ3fÿffÿ™fÿÌfÿÿ™™3™f™™™Ì™ÿ™3™33™3f™3™™3Ì™3ÿ™f™f3™ff™f™™fÌ™fÿ™™™™3™™f™™™™™Ì™™ÿ™Ì™Ì3™Ìf™Ì™™ÌÌ™Ìÿ™ÿ™ÿ3™ÿf™ÿ™™ÿÌ™ÿÿÌÌ3ÌfÌ™ÌÌÌÿÌ3Ì33Ì3fÌ3™Ì3ÌÌ3ÿÌfÌf3ÌffÌf™ÌfÌÌfÿ̙̙3Ì™fÌ™™Ì™ÌÌ™ÿÌÌÌÌ3ÌÌfÌÌ™ÌÌÌÌÌÿÌÿÌÿ3ÌÿfÌÿ™ÌÿÌÌÿÿÿÿ3ÿfÿ™ÿÌÿÿÿ3ÿ33ÿ3fÿ3™ÿ3Ìÿ3ÿÿfÿf3ÿffÿf™ÿfÌÿfÿÿ™ÿ™3ÿ™fÿ™™ÿ™Ìÿ™ÿÿÌÿÌ3ÿÌfÿÌ™ÿÌÌÿÌÿÿÿÿÿ3ÿÿfÿÿ™ÿÿÌÿÿÿ (((555CCCPPP]]]kkkxxx†††“““¡¡¡®®®»»»ÉÉÉÖÖÖäääñññÿÿÿ!ù ×,¯; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/ecard_images/postcard.gif gallery-1.5.1/images/ecard_images/postcard.gif --- gallery-1.5-pl1/images/ecard_images/postcard.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/ecard_images/postcard.gif 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,6 @@ +GIF89a<æÒÖÙÁ®š4a»7U™éì﮲¶f5D¥¥´ÅËÒÖÖ匋¹ÕÕÝÜ[÷ùû±õ¼¼ËÆÍÕº¹Â€•Ózz‚É„Ms`M›¶êÞÞæ™™™¤«¿ÈÌâjq‘ñôø>sÜ··Åx«õLMP«}Nàãæ1WhJöÀÃÖx[BÌÐ囪Όª¤¤¯4oÙƒ„¢z|x®µ½””ÁíïñÕÜç¹¼¿ãæè¾Âdz´Ð–°èÝÝßÅÅÐJ|ê¼ðŒŒ¨ÿÿÿgF(ÎÖßÏÏ×ïïöƒ™žž¬Z—õ­¬µÑÚ嶺¿™™Ìö÷ùææî3fÌSoîv€–¼ÄÏ>`ªoo…ÙÝîÃÂÃÅÅÜYRZ:ÓÒKãäåæçÓÑáÕ×Å ukY÷÷3úûýþÿÿöydŽ];ZY pÂ0BÚ˜H¢" 3j´8±ß |÷ªaa‚¥¤Iw¨T¹Ã"‰•*Àg¦˜YH0¡gˆOŸèØ€s¤ÐB„$²£)€/GœIòîÍBŽÖ @’¯¶M @ž?‡à¡ frÿj@=g‚œ#GŠhH¹òŒ•7 +žy¦œ®qo…g¿)b0ìùðç‚A7$¹‹÷ÈŽ1e (RDŠ—¨ÉƬøð_/¼øû7F’80à©ELŽ!N4±ò…ŸÈwLXμEh˜G$H—0Sñ×$hæ +óF‚ TVü†àÆ +T†dÀ{ƒ³—ÃE@(È"ªTÓ¥³Þƒ‹ÿýÿÝ x=ìaÄQ<ÑÇC0ÁDJ¥æ]H·CcdFAtØa~ †8]SÒo\ÁF1hÑÅ LL$#1°ØaGyP á#)äCÒÇ&èÄ`SlQ€ƒ$™„ ±Øh#Žy¼ \r ¤‡?†)æ—&"adAtIƒ>°àæ›>Ä)gœkÔi'P˜éå˜zªÙ%ŸH Ò'—Pj衈& +Eš~6êè£4ÊȤ”VºH ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/icons/camera.gif gallery-1.5.1/images/icons/camera.gif --- gallery-1.5-pl1/images/icons/camera.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/icons/camera.gif 2005-06-26 02:22:05.000000000 +0200 @@ -0,0 +1,2 @@ +GIF89aæååæààáÏÏÐWY`;D_?CN&O'BzàáãÔÕ×f›ÿZbp–³ß›¶àUcwcˆ¶´ÄØÂÏߢ¢ ÚÚÙÖÖÕÅÅIJ±­¸¶¯°¯¬|ysŠˆ„¢¡Ÿ×ÖÔš˜–âàÞÕÓÑ¿¾½Ù×Öfddÿÿÿøøø÷÷÷ôôôðððïïïîîîíííéééèèèçççæææåååäääãããâââáááàààßßßÞÞÞÝÝÝÜÜÜÙÙÙØØØÖÖÖÕÕÕÓÓÓÑÑÑÍÍÍÌÌÌËËËÉÉÉÈÈÈÆÆÆÅÅÅÃÃÃÂÂÂÁÁÁÀÀÀ¿¿¿¾¾¾¼¼¼¸¸¸···´´´²²²±±±°°°¯¯¯®®®­­­«««©©©¨¨¨§§§¦¦¦¤¤¤¡¡¡   žžžœœœ›››ššš™™™˜˜˜‘‘‘ŽŽŽŒŒŒŠŠŠ‰‰‰ˆˆˆ„„„‚‚‚~~~{{{tttbbb```XXXVVVUUUSSSPPPNNNLLLIIIGGGEEECCCAAA@@@ÿÿÿ!ù,Ï€‚ƒ„…†‡…mjoƒk9250B#&'+2::,(, "8#$(-7=&*241pE~ j(; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/icons/decrypted.gif gallery-1.5.1/images/icons/decrypted.gif --- gallery-1.5-pl1/images/icons/decrypted.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/icons/decrypted.gif 2005-06-26 02:22:05.000000000 +0200 @@ -0,0 +1,5 @@ +GIF89a÷YTiRRtgg†\\wii‡ii…||™{{˜yy’™ŸŸ¶  ¶››¯††—  ³³³ÅµµÆ  ¯¦¦³±±¾¹¹ÅÄÄв²¼××àÕÕÞÜÜäÛÛâÄÄÅRUw@Gvnt˜w}Ÿš¡»°¶¿ýýùûû÷üüùëëéèèæüüûøø÷þù:ýöWýõXýöZüóZýñUûñjþé!þç"þé#þë#üëRþä,þÓþÓþÓþÕþÏþÒ&þ¿þ¿þÀþÂþ¾þ½þ¾þÀ%þ® þ®þ°þ¯þ±þ²þ¨ þ¨þ©þ«þ«þ£ +þ¤ þ£þ˜þž þ™ +þ› þž þŸ Àšcþ“þ’þ˜þ• ۈ݋܋܋Շ Ï…"¿{!¿€(¨p#¶‘`þŒþþŒþŽþþ’ ܈¶v(ªw9þ„þˆþ†þ‰¨bŽZþþƒþ‚ˆM|Lþz‡JŽN‡K„O‡G‡H‡I{G{HyH‡C‡D‡F|A{?ˆB„?{>y;d6d2þþþèèè»»»ÿÿÿ!ù”,Õ) ¸Â*xàB$#D`8°P € (&$@Á„œ``ƒ *VT@ဠ*zøÐA!‡I*êÄÂ6`¾x #FL—7X̸Hæ‹P£®p¡‚ÆeRÀÁµ«Œ1xÐX§†hoàÀ‘C‡)}êÙÑÇÝ>€$©²&K"„„Ar¤É(Vب™sF‘ÀAAŠ0‰r… +—5iäàÓH`¡!D”<™²E š8wììq$ðÑŸ<~ø +Ñ!C‹A¢; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/icons/ecard.gif gallery-1.5.1/images/icons/ecard.gif --- gallery-1.5-pl1/images/icons/ecard.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/icons/ecard.gif 2005-04-19 00:44:35.000000000 +0200 @@ -0,0 +1,2 @@ +GIF89a÷›’ÂîªÚöN¾þŠÞþ¾òúT¹$«þfP:NQW^ÂdÉffjs»e‡„ƒÎTU\‹ˆ¡…‚œ†Î¾‰‡ŸEªvÊv>žqœª¬…™ ¸À¿´·¿Š‡ –¢ª©¶µ~‘˜§­µµ½ÌÌÝŸœ¸ÆÆÙÃÃØy¼"f¾…ƒÒäÝÐÙÚÛåâ½Ôðj¶bÓãÞ¨¥ÃÂËÆNºN«¯·ÏâÖÔÛß}z‘ln‡¤©´ ¡«ÃÕÇ>ª>Š ÌÝÑ"¦"?­¾º‹™¤b¶Ž“‘©¾½Ö×æ᭬Ǽ½Æ­±¶ÅÞõâòò^Ê®¨¶º ¬¯Ÿª¯Á¾Ì–¡©ÕæÚ«´µÆÍÊ‹‰¡Ñßш†Ÿ¡¯¬¢ÊÊÔ°±ÈÅËÒÆÏÍÌÖ̲ÀÆw‹“*vÆÅÆÝÓÜÜ–ÞþIyº¬¸¸ÔÔßÇàø¥§°ÉÝÏ—¡—¨«èóãÏÑÕ½ÅÁ¶ÁÁ™ž«‘ ¥ÚêÝàëãÞßèž­­——¢Jzº¿¾Õf€¯Šˆ¡‰†Ÿ¹ºÉ»ÃÄÈÈÚ:ž:Êêò¿À×ÏÝÜÔäÚK|»ØßÜ—›¦»ÇÈx¼ÇÍÑÚç䲲˂Öî>†Î®¼¾nq„ØæÚŠŠŠˆ…žŠ‡žªÂÚ®­È—¤«VžÚ|’³Z®Zÿÿÿ!ù›,ñH`ƒM*\¸PÁ&"‘ ‹ +Øȱc %•08d2 Ñ€“(¥À`Á‚ÃYPBS˜8sFØ4ƒÇŸ]À (ƒ!&ĆL‰Pè)ƒ§Ž-š2$ˆ"GÆŽ9R­P‚Æ…J@´~ñK$5F` ú"¤„Š\zâeŠ35):”ƒQˆÙرâÃÉIîŒp#¨Ê ÁiÊ!i:è@"Fš êâ‡N‹1,lp‰sD‚¤ õr†Ä'ò±ãʦãuˆôðPϤ&LØs# ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/icons/editcopy.gif gallery-1.5.1/images/icons/editcopy.gif --- gallery-1.5-pl1/images/icons/editcopy.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/icons/editcopy.gif 2005-06-26 02:22:05.000000000 +0200 @@ -0,0 +1,2 @@ +GIF89aæss—yyœxx›||ž€€¢‡‡©††¨‚‚£‡‡¨ŒŒ«‹‹ª‹‹©’’±«——¶––³——³››·šš¶  ¼žž¹¦¦Â««Æ««Å²²Ì²²Ê¶¶Î¹¹Ð¸¸Ï··ÎÀÀ׿¿ÖÆÆÜÂÂ×ÅÅÚÃÃØÊÊÞÉÉÝÈÈÜÆÆÚÃÃ×ÒÒæÌÌàÑÑäÎÎáÏÏáÚÚì××éÑÑâÜÜíÐÐàÎÎÞââóààðÞÞîÝÝíÜÜì××çÖÖæÝÝìÕÕäèè÷ääóââñááðààîççõââðééöèèõææóääñððüóóþññüííøìì÷óóýîîøíí÷óóüððùööþõõýññù÷÷þññøøøþùùþøøý÷÷üùùýøøüüüþýýþþþþÿÿÿ!ù`,¹€":<0-+`‰ŠŠ3_ŽXO9ˆ‹ŒŽ_]M ”‰Ž^Q5&ŸŽP)&#•ŽIC'V³F@žŽRD>%\–J8¡KL$Z–S?UJNÌÎŽUD,'2_USPH*Ú_K;*-(TGCA7 YŽJ?1/. þþ&ôzRć +:qèòJ"B€ÐHHÉÖ+M¢0‰8±S,^°X["¤G‚N "¨”àÀÁ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/icons/idea.gif gallery-1.5.1/images/icons/idea.gif --- gallery-1.5-pl1/images/icons/idea.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/icons/idea.gif 2005-06-26 02:22:05.000000000 +0200 @@ -0,0 +1 @@ +GIF89aæàß빸Ǖ”¨‹‹ --/HHImmn‚‰Š–›œ¤¹º¾bdeÿÿÿÿÕÿÿÖÿñÿú©ÿîüçúåøäÿù¨ÿüÒÿüÓÿúÏÿáÿãþáÿívÿÚÿÛóÑòÐÿá:ÿèjÿìtÿï—ÿðšÿÖÿÒÿÓÿÖ ÿ× ÿØ ÿÞ2ÿà9å·ô½â´ÿÐ)ÿÔ6ÿñ¾ò»þ ý þâÿä‘ÿð½û¿8üÄAþã©þæ°ÕŒç–à‘ÜŽÖ‹Ôˆ{U„]“k'ª‚?ô¿kõÂrÝåˆ×oá‚Û}Õl×s ÚwÜ~Û}×iÔeÌdÉbÆa‚=±k*Ñ`Í]È]ÄZÀZÄU¼RºRˆ„„ÿÿÿ!ùg,ž€g‚‚XTUVS_ƒ‹g^PL@<6?KQcŒgN;:MŒW>('©'(=`‹O5&%´µ4Z‹R8/$0¿0$/9[ŒB*,.Ê-,+CdŒY2 )Õ)!7b˜gDFÛga"#eåg1ò3ïgEAö]JIábÏL°ç Á Ø;s˜; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/icons/kcmfontinst.gif gallery-1.5.1/images/icons/kcmfontinst.gif --- gallery-1.5-pl1/images/icons/kcmfontinst.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/icons/kcmfontinst.gif 2005-06-26 02:22:05.000000000 +0200 @@ -0,0 +1,5 @@ +GIF89a÷çåäãàØÕÐÎÍËÉÄ¡ŽÍÀ~ÿ ð Í ‡Å­ô­ôöÿ ÿ!!ÿ""ÿ$$¥ÿ//ô--î,,É((ÿ66ÿ::Ç55·11ä??öEEýJJÿLLüZZùYYÿbbüjjójj¹QQÿxxc//üzzú~~ÿúŠŠmAAþ˜˜ú™™ŠVVN11ÿ¢¢æššþ««ÿ··üµµeJJYBBÿÌÌÿààòÕÕ ÝÝÝÊÊʸ¸¸¶¶¶²²²ªªª©©©¡¡¡ˆˆˆ|||xxxfffdddccc```YYYXXXWWWQQQNNNJJJHHHGGGDDDBBBAAA>>>===<<<;;;:::999888777222,,,&&&$$$"""!!! + + + ÿÿÿ!ù„,Ë H° A +¼¨MÁF ™Ah :N˜ D@`CŽ#Htð±3E‰(„ ÈpÃIþTYEK*(¼"D?[ž4i‚e €‘ÿB˜ÿF–ü9‚ÐDx³S§üE|´$%&X°ÿL‚³Nƒ³L’Ìc¶ÿi¼ÿX—ÍO†´~ÄÿÍãö^¹ÿo¿ÿrÁÿvÀùj¡Í…ËÿÍÿŽÎÿÏÿx¯×j˜¸ÁåýÅ×äXz!6BšÚÿ|¯ËÜÿ®àþ®áü"-1Gbi–¶½Vno!""[qp?FC'0*/3! +ccY&&%¬¬©žžœÈÈƸ¸¶}}|÷÷ö½½¼¥¥¤¤¤£££¢¡¡   Ÿœœ›››šÐÏÊ + "!«ª§ÿþû¬ª¥«©¤«©¥¬ª§àÜ׫¨¥ßÜÙª¨¦«©§ ßÛØÞÚت¨§àÜÛÝÙØÞÙØÞØØÝÙÙª¨¨ª©©ÿÿÿ«««ªªª¥¥¥¤¤¤£££¢¢¢¡¡¡   ŸŸŸœœœ›››™™™iii***'''ÿÿÿ!ùÊ,ÿ•ÉàE©’¥KÀ09ʤ©G1cÊ”U‹V-Y³f½jU*• _1¸òe 1]ª@I2ȧˆ¤„pYæ™0Z¦,9â#TÄUMÎÀ‘3'Nš2[¢(ù1*",#oøØQÓG/TœQ:~$º³™,Oˆ ŠhKDBp-$()AnEŒÁi“)CúÃÊJ§¹"Úx¤(Y²Aˆ\% €äÔ¤uÑHA €1òt¬ŽˆÀV°0QÂD‹'B ø aGD tè a + $(0,b° ,Xpðà‚‚€Ñ.6àÀÝC„*rDŒ”kW¯^¾~Ó!Œ±_3”; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/icons/viewmag1.gif gallery-1.5.1/images/icons/viewmag1.gif --- gallery-1.5-pl1/images/icons/viewmag1.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/icons/viewmag1.gif 2005-06-26 02:22:05.000000000 +0200 @@ -0,0 +1,3 @@ +GIF89aæÿþÿþþÿö÷øÀÌÌÚáá÷ùùþÿÿö÷÷0*71B<+#ó÷öòöõ8(Svka€vïõóüÿþÏÙÕó÷õôöõ @%,U=FuZFsYQ/FtY¸Ë¿¿ÏÅ]‚jšˆöù÷@jMU( JCxM2lF?1C8• OOB-´¶•A¾µ•‚/! @ÇÀÉ οɂÓÏÖPØÔÈÖÝÚÖ J.©«ãD;E9Û)4ÛP"$'+6„; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/images/icons/yast_kuser.gif gallery-1.5.1/images/icons/yast_kuser.gif --- gallery-1.5-pl1/images/icons/yast_kuser.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/images/icons/yast_kuser.gif 2005-06-26 02:22:05.000000000 +0200 @@ -0,0 +1,3 @@ +GIF89a÷‚²û¼û—·á¯ÐýV‹Ë`ŽÅ]~¥•·ßCuFy@i)]•,]”~¹ùEd‡g•È4H^FYoÑçÿÔèÿÖèü+LoK~²m®ó|»ûƒ½ø›ÆñœÇñ›Æð§Íó¯Òõr†špƒ—ÖèûZ›Úq¶öS¬ŠÂøˆÀô›Çð¢Íö[q†§Îó²Õög©â€Áú‚Äü‚½ï‹ÅöŠÂñÅñ“Èó¢Ñød|‘Ãàø‹ÆóŽÈóÆñ™Óÿ’Èò˜ÈîÂàø–Îõ—ÏöžØÿ˜Ïõ·âÿŸÔ÷žÓöžÔö Öø¡Öø¯àûµäÿs¬È®àú¸æý¹çý¾êÿÁíÿV¸ÎóÿÐùÿo·½ÒûÿPŸžh®®ÞÿÿFž„i¢ŒPªˆ!ÆíÈËìÍÊîËlÍl´ê´@²>tÊr€Ã~6q3‰¿†tnÆgpÇj{®wBpÇg_¢Y¯ ‰Õ€G+ªG²3„Ïu*³ +9·D·(ƒÏp†Ðs,´ „>Á0´B½F¿OÃ!oÇM:À=¿FÍ IÁ@Å'oRÆRÆ%[LÍJÊIÈeÇ)SÏQÎRÎ?XÓUÐc×zã,ˆÒT^×Þ6hÞmá‡ñ5X–àPrãwâ ƒëR~!šäHŒñ—ýe•( ÿi™ÿÿÿ!ù§,áO 8M™4Ã¥‹0d4óÍš3bÂ$$p@€-sø êC§š$„ 0A œD‘Â3A† '8h€Å“¨O“ + \0âEŒ/.@©ŠÓŸ7¸øaĈVîØ‘ã&AI¢D2¥Ž!C‡üèÉ3Š6T äHÒ£E€öLPbEhÁÔ)“%E‚#ÇŒ2L°¸Tj”&JŒ j#H"An`ÈbŠ¨M-9‚¤ “%CtPX‡)W®PyBÃÄSR€øP#Âï€; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/includes/add_photos/add_admin.inc gallery-1.5.1/includes/add_photos/add_admin.inc --- gallery-1.5-pl1/includes/add_photos/add_admin.inc 2005-03-10 03:30:04.000000000 +0100 +++ gallery-1.5.1/includes/add_photos/add_admin.inc 2005-09-13 00:40:46.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: add_admin.inc,v 1.4.2.1 2005/03/10 02:30:04 cryptographite Exp $ + * $Id: add_admin.inc,v 1.5.2.1 2005/09/12 22:40:46 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/includes/add_photos/add_applet.inc gallery-1.5.1/includes/add_photos/add_applet.inc --- gallery-1.5-pl1/includes/add_photos/add_applet.inc 2005-03-10 03:30:04.000000000 +0100 +++ gallery-1.5.1/includes/add_photos/add_applet.inc 2005-09-13 00:40:46.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: add_applet.inc,v 1.7.2.1 2005/03/10 02:30:04 cryptographite Exp $ + * $Id: add_applet.inc,v 1.8.2.1 2005/09/12 22:40:46 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/includes/add_photos/add_applet_mini.cfg gallery-1.5.1/includes/add_photos/add_applet_mini.cfg --- gallery-1.5-pl1/includes/add_photos/add_applet_mini.cfg 2005-03-10 03:30:04.000000000 +0100 +++ gallery-1.5.1/includes/add_photos/add_applet_mini.cfg 2005-09-13 00:40:46.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: add_applet_mini.cfg,v 1.1.8.1 2005/03/10 02:30:04 cryptographite Exp $ + * $Id: add_applet_mini.cfg,v 1.2.2.1 2005/09/12 22:40:46 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/includes/add_photos/add_applet_mini.inc gallery-1.5.1/includes/add_photos/add_applet_mini.inc --- gallery-1.5-pl1/includes/add_photos/add_applet_mini.inc 2005-03-10 03:30:04.000000000 +0100 +++ gallery-1.5.1/includes/add_photos/add_applet_mini.inc 2005-09-13 00:40:46.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: add_applet_mini.inc,v 1.6.6.1 2005/03/10 02:30:04 cryptographite Exp $ + * $Id: add_applet_mini.inc,v 1.7.2.1 2005/09/12 22:40:46 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/includes/add_photos/add_form.inc gallery-1.5.1/includes/add_photos/add_form.inc --- gallery-1.5-pl1/includes/add_photos/add_form.inc 2005-03-10 03:30:04.000000000 +0100 +++ gallery-1.5.1/includes/add_photos/add_form.inc 2005-09-13 00:40:46.000000000 +0200 @@ -15,21 +15,17 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: add_form.inc,v 1.22.2.1 2005/03/10 02:30:04 cryptographite Exp $ + * $Id: add_form.inc,v 1.24.2.1 2005/09/12 22:40:46 dmolavi Exp $ */ ?> "; echo _("Click the Browse button to locate a photo to upload."); @@ -49,15 +45,7 @@ - + - +
-
-
diff -Naur gallery-1.5-pl1/includes/add_photos/add_other.inc gallery-1.5.1/includes/add_photos/add_other.inc --- gallery-1.5-pl1/includes/add_photos/add_other.inc 2005-03-10 03:30:04.000000000 +0100 +++ gallery-1.5.1/includes/add_photos/add_other.inc 2005-09-13 00:40:46.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: add_other.inc,v 1.10.2.1 2005/03/10 02:30:04 cryptographite Exp $ + * $Id: add_other.inc,v 1.11.2.1 2005/09/12 22:40:46 dmolavi Exp $ */ ?>

diff -Naur gallery-1.5-pl1/includes/add_photos/add_url.inc gallery-1.5.1/includes/add_photos/add_url.inc --- gallery-1.5-pl1/includes/add_photos/add_url.inc 2005-03-23 09:51:50.000000000 +0100 +++ gallery-1.5.1/includes/add_photos/add_url.inc 2005-09-13 00:40:46.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: add_url.inc,v 1.12.2.2 2005/03/23 08:51:50 cryptographite Exp $ + * $Id: add_url.inc,v 1.14.2.1 2005/09/12 22:40:46 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/includes/add_photos/captionOptions.inc.php gallery-1.5.1/includes/add_photos/captionOptions.inc.php --- gallery-1.5-pl1/includes/add_photos/captionOptions.inc.php 2005-03-10 03:30:04.000000000 +0100 +++ gallery-1.5.1/includes/add_photos/captionOptions.inc.php 2005-09-13 00:40:46.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: captionOptions.inc.php,v 1.2.4.1 2005/03/10 02:30:04 cryptographite Exp $ + * $Id: captionOptions.inc.php,v 1.3.2.1 2005/09/12 22:40:46 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/includes/definitions/albumProperties.php gallery-1.5.1/includes/definitions/albumProperties.php --- gallery-1.5-pl1/includes/definitions/albumProperties.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/includes/definitions/albumProperties.php 2005-09-13 00:40:46.000000000 +0200 @@ -0,0 +1,486 @@ + + array ( + 'type' => "group_start", + 'name' => "group_text", + 'default' => "inline", + 'title' => _("Texts"), + 'contains_required' => false, + ), + 'summary' => array( + 'prompt' => _("Album Summary"), + 'desc' => '', + 'value' => $gallery->album->fields["summary"], + 'type' => "textarea", + 'attrs' => array('cols' => 40, 'rows' => 6) + ), + 'title' => array( + 'prompt' => _("Album Title"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["title"] + ), + 'group_text_end' => array ( + 'type' => "group_end", + ), + 'group_layout_start' => array ( + 'type' => "group_start", + 'name' => "group_layout", + 'default' => "none", + 'title' => _("Layout"), + 'desc' => "" + ), + 'background' => array( + 'prompt' => _("Background Image (URL)"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["background"] + ), + 'font' => array( + 'prompt' => _("Font"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["font"] + ), + 'rows' => array( + 'prompt' => _("Rows"), + 'desc' => '', + 'choices' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10), + 'value' => $gallery->album->fields["rows"] + ), + 'cols' => array( + 'prompt' => _("Columns"), + 'desc' => '', + 'choices' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10), + 'value' => $gallery->album->fields["cols"] + ), + 'border' => array( + 'prompt' => _("Borders"), + 'desc' => '', + 'choices' => array(0 => 0, 1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 10 => 10, 15 => 15, 20 => 20), + 'value' => $gallery->album->fields["border"] + ), + 'subgroup_colors' => array ( + 'type' => "subgroup", + 'title' => _("Colors") + ), + 'bgcolor' => array( + 'prompt' => _("Background Color"), + 'desc' => '', + 'type' => 'colorpicker', + 'value' => $gallery->album->fields["bgcolor"] + ), + 'textcolor' => array( + 'prompt' => _("Text Color"), + 'desc' => '', + 'type' => 'colorpicker', + 'value' => $gallery->album->fields["textcolor"] + ), + 'linkcolor' => array( + 'prompt' => _("Link Color"), + 'desc' => '', + 'type' => 'colorpicker', + 'value' => $gallery->album->fields["linkcolor"] + ), + 'bordercolor' => array( + 'prompt' => _("Border color"), + 'desc' => '', + 'type' => 'colorpicker', + 'value' => $gallery->album->fields["bordercolor"] + ), + 'subgroup_frams' => array ( + 'type' => "subgroup", + 'title' => _("Frames") + ), + 'album_frame' => array( + 'prompt' => _("Album Frame"), + 'desc' => '', + 'choices' => available_frames(), + 'value' => $gallery->album->fields["album_frame"] + ), + 'thumb_frame' => array( + 'prompt' => _("Thumb Frame"), + 'desc' => '', + 'choices' => available_frames(), + 'value' => $gallery->album->fields["thumb_frame"] + ), + 'image_frame' => array( + 'prompt' => _("Image Frame"), + 'desc' => '', + 'choices' => available_frames(), + 'value' => $gallery->album->fields["image_frame"] + ), + 'group_layout_end' => array ( + 'type' => "group_end" + ), + 'group_slideshow_start' => array ( + 'type' => "group_start", + 'name' => "group_slideshow", + 'default' => "none", + 'title' => _("Slideshow"), + 'desc' => "" + ), + 'slideshow_type' => array( + 'prompt' => _("Slideshow Type"), + 'desc' => '', + 'choices' => array( "off" => _("Off"), "ordered" => _("Ordered"), "random" => _("Random")), + 'value' => $gallery->album->fields["slideshow_type"] + ), + 'slideshow_recursive' => array( + 'prompt' => _("Include sub-albums in slideshow"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["slideshow_recursive"] + ), + 'slideshow_loop' => array( + 'prompt' => _("Allow slideshow to loop"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["slideshow_loop"] + ), + 'slideshow_length' => array( + 'prompt' => _("Slideshow Length"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["slideshow_length"], + 'vartype' => 'int_empty' + ), + 'group_slideshow_end' => array ( + 'type' => "group_end" + ), + 'group_sizes_start' => array ( + 'type' => "group_start", + 'name' => "group_sizes", + 'default' => "none", + 'title' => _("Sizes"), + 'desc' => "" + ), + 'thumb_size' => array( + 'prompt' => _("Thumbnail size"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["thumb_size"], + 'vartype' => 'int_notnull' + ), + 'resize_size' => array( + 'prompt' => _("Maximum dimensions of intermediate sized images"), + 'desc' => '', + 'choices' => array(0 => _("off"), 400 => 400, 500 => 500, 600 => 600, 640 => 640, 700 => 700, 800 => 800, 1024 => 1024, 1280 => 1280), + 'value' => $gallery->album->fields["resize_size"], + 'vartype' => 'int_empty' + ), + 'resize_file_size' => array( + 'prompt' => _("Maximum file size of intermediate sized JPEG/PNG images in kilobytes (0 or blank for no size restriction)"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["resize_file_size"], + 'vartype' => 'int_empty' + ), + 'max_size' => array( + 'prompt' => _("Maximum dimensions of full sized images"), + 'desc' => '', + 'choices' => array(0 => _('off'), 400 => 400, 500 => 500, 600 => 600, 640 => 640, 700 => 700, 800 => 800, 1024 => 1024, 1280 => sprintf(_('%d (%d MPix)'), 1280, 1), 1600 => sprintf(_('%d (%d MPix)'), 1600, 2), 2048 => sprintf(_('%d (%d MPix)'), 2048, 3)), + 'value' => $gallery->album->fields["max_size"], + 'vartype' => 'int_empty' + ), + 'max_file_size' => array( + 'prompt' => _("Maximum file size of full sized JPEG/PNG images in kilobytes (0 or blank for no size restriction)"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["max_file_size"], + 'vartype' => 'int_empty' + ), + 'group_sizes_end' => array ( + 'type' => "group_end" + ), + 'group_display_start' => array ( + 'type' => "group_start", + 'name' => "group_display", + 'default' => "none", + 'title' => _("Display"), + 'desc' => "" + ), + 'display_clicks' => array( + 'prompt' => _("Display click counter for this album?"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["display_clicks"] + ), + 'item_owner_display' => array( + 'prompt' => _("Display owners name with caption"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["item_owner_display"] + ), + 'showDimensions' => array( + 'prompt' => _("Display clickable image dimensions"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["showDimensions"] + ), + 'use_exif' => array( + 'prompt' => _("Display EXIF data?"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["use_exif"], + 'skip' => (empty($gallery->app->use_exif)) ? true : false + ), + 'group_display_end' => array ( + 'type' => "group_end" + ), + 'group_services_start' => array ( + 'type' => "group_start", + 'name' => "group_services", + 'default' => "none", + 'title' => _("Services"), + 'desc' => "" + ), + 'print_photos' => array( + 'prompt' => _("Which photo printing services
do you want to let visitors use?"), + 'desc' => '', + 'multiple_choices' => array( + 'photoaccess' => 'PhotoWorks', + 'shutterfly' => 'Shutterfly', + 'fotoserve' => 'Fotoserve.com', + 'fotokasten' => 'Fotokasten', + 'mpush' => 'mPush' + ), + 'value' => $gallery->album->fields['print_photos'] + ), + 'ecards' => array( + 'prompt' => _("Enable Ecards ?"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => isset($gallery->album->fields["ecards"]) ? $gallery->album->fields["ecards"] : 'no', + 'skip' => ($gallery->app->emailOn == 'yes') ? false : true + ), + 'group_services_end' => array ( + 'type' => "group_end" + ), + 'group_pollProperties_start' => array ( + 'type' => "group_start", + 'name' => "group_pollProperties", + 'default' => "none", + 'title' => _("Poll Properties"), + 'desc' => "" + ), + 'poll_type' => array( + 'prompt' => _("Type of poll for this album"), + 'desc' => '', + 'choices' => array("rank" => _("Rank"), "critique" => _("Critique")), + 'value' => $gallery->album->fields["poll_type"] + ), + 'poll_scale' => array( + 'prompt' => _("Number of voting options"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->getPollScale(), + 'vartype' => 'int_empty' + ), + 'poll_show_results' => array( + 'prompt' => _("Show results of voting to all visitors?"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["poll_show_results"] + ), + 'poll_num_results' => array( + 'prompt' => _("Number of lines of results graph to display on the album page"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->getPollNumResults(), + 'vartype' => 'int_empty' + ), + 'voter_class' => array( + 'prompt' => _("Who can vote?"), + 'desc' => '', + 'choices' => array("Logged in" => _("Logged in"), "Everybody" => _("Everybody"), "Nobody" => _("Nobody")), + 'value' => $gallery->album->fields["voter_class"] + ), + 'poll_orientation' => array( + 'prompt' => _("Orientation of vote choices"), + 'desc' => '', + 'choices' => array('horizontal' => _("Horizontal"), 'vertical' => _("Vertical")), + 'value' => isset($gallery->album->fields['poll_orientation']) ? + $gallery->album->fields['poll_orientation'] : '' + ), + 'poll_hint' => array( + 'prompt' => _("Vote hint"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->getPollHint(), + 'attrs' => array('size' => 60) + ), + 'poll_displayed_values' => array( + 'prompt' => _("Voting Options"), + 'desc' => '', + 'type' => 'table_values', + 'elements' => buildVotingInputFields(), + 'columns' => array(_("Displayed Value"),_("Points")), + 'value' => '' + ), + 'group_pollProperties_end' => array ( + 'type' => "group_end" + ), + 'group_misc_start' => array ( + 'type' => "group_start", + 'name' => "group_misc", + 'default' => "none", + 'title' => _("Misc"), + 'desc' => "" + ), + 'add_to_beginning' => array( + 'prompt' => _("Add new items at beginning of album"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["add_to_beginning"] + ), + 'returnto' => array( + 'prompt' => _("Show Return to link"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["returnto"] + ), + 'use_fullOnly' => array( + 'prompt' => _("Offer visitors ability to specify
preference for full-size or resized images"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["use_fullOnly"] + ), + 'fit_to_window' => array( + 'prompt' => _("Auto fit-to-window for
images without a resized copy"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["fit_to_window"] + ), + 'subgroup_ermission' => array ( + 'type' => "subgroup", + 'title' => _("Permissions") + ), + 'item_owner_modify' => array( + 'prompt' => _("Allow item owners to modify their images"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["item_owner_modify"] + ), + 'item_owner_delete' => array( + 'prompt' => _("Allow item owners to delete their images"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["item_owner_delete"] + ), + 'group_misc_end' => array ( + 'type' => "group_end" + ), + 'group_CustomFields_start' => array ( + 'type' => "group_start", + 'name' => "group_CustomFields", + 'default' => "none", + 'title' => _("Custom Fields") + ), + 'extra_fields' => array( + 'prompt' => '', + 'desc' => '', + 'multiple_choices' => isset($multiple_choices_EF) ? $multiple_choices_EF : '', + 'value' => !empty($checked_EF) ? $checked_EF : '', + ), + 'num_user_fields' => array( + 'prompt' => _("Number of user defined custom fields"), + 'desc' => '', + 'type' => 'text', + 'value' => $num_user_fields, + 'attrs' => array('size' => 2), + ) + ); +if (isset($customFields)) { + $properties = array_merge($properties, $customFields); +} + $properties = array_merge($properties, array( + 'group_CustomFields_end' => array ( + 'type' => "group_end" + ), + 'group_MicroThumbs_start' => array ( + 'type' => "group_start", + 'name' => "group_MicroThumbs", + 'default' => "none", + 'title' => _("Microthumbs") + ), + 'nav_thumbs' => array( + 'prompt' => _("Use micro thumb photo navigation"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no"), "both" => _("both")), + 'value' => $gallery->album->fields["nav_thumbs"] + ), + 'nav_thumbs_style' => array( + 'prompt' => _("Micro thumb style"), + 'desc' => '', + 'choices' => array("fixed" => _("Fixed"), "dynamic" => _("Dynamic")), + 'value' => $gallery->album->fields["nav_thumbs_style"] + ), + 'nav_thumbs_first_last' => array( + 'prompt' => _("Show first & last micro thumb"), + 'desc' => '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => $gallery->album->fields["nav_thumbs_first_last"] + ), + 'nav_thumbs_prev_shown' => array( + 'prompt' => _("Number of previous thumbs"), + 'desc' => '', + 'choices' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10), + 'value' => $gallery->album->fields["nav_thumbs_prev_shown"] + ), + 'nav_thumbs_next_shown' => array( + 'prompt' => _("Number of next thumbs"), + 'desc' => '', + 'choices' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10), + 'value' => $gallery->album->fields["nav_thumbs_next_shown"] + ), + 'nav_thumbs_location' => array( + 'prompt' => _("Position of micro-thumb navigation bar"), + 'desc' => '', + 'choices' => array("top" => _("Top"), "both" => _("Both"), "bottom" => _("Bottom")), + 'value' => $gallery->album->fields["nav_thumbs_location"] + ), + 'nav_thumbs_size' => array( + 'prompt' => _("Height of micro-thumbs in navigation bar"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["nav_thumbs_size"], + 'attrs' => array('size' => 3) + ), + 'nav_thumbs_current_bonus' => array( + 'prompt' => _("Bonus to height of current micro-thumb (pixels)"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["nav_thumbs_current_bonus"], + 'attrs' => array('size' => 3) + ), + 'group_MicroThumbs_end' => array ( + 'type' => "group_end" + ), + ) +); + +?> \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/includes/definitions/services.php gallery-1.5.1/includes/definitions/services.php --- gallery-1.5-pl1/includes/definitions/services.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/includes/definitions/services.php 2005-09-13 00:40:46.000000000 +0200 @@ -0,0 +1,48 @@ + + array( + 'name' => 'PhotoWorks', + 'url' => 'http://www.photoworks.com/' + ), + 'shutterfly' => array( + 'name' => 'Shutterfly', + 'url' => 'http://www.shutterfly.com/' + ), + 'fotoserve' => array( + 'name' => 'Fotoserve.com', + 'url' => 'http://www.fotoserve.com/' + ), + 'fotokasten' => array( + 'name' => 'Fotokasten', + 'url' => 'http://www.fotokasten.de/' + ), + 'mpush' => array( + 'name' => 'mPUSH', + 'url' => 'http://www.mpush.cc/', + 'description' => _("mPUSH is a photo service that adds the ability to send thumbnail images to your, or a friend's, cellphone for a small fee.") + ) +); +?> diff -Naur gallery-1.5-pl1/includes/ecard/templates/ecard_1.tpl gallery-1.5.1/includes/ecard/templates/ecard_1.tpl --- gallery-1.5-pl1/includes/ecard/templates/ecard_1.tpl 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/includes/ecard/templates/ecard_1.tpl 2005-08-09 16:27:44.000000000 +0200 @@ -0,0 +1,37 @@ + + + + + Gallery E-C@rd + + + + + +
+ + class="ecard" height="400" align="center" cellpadding="3" cellspacing="0"> + + + + + + + + +
+
+
+ E-C@rd from <%ecard_sender_name%> +
<%ecard_message%>
+ + + + diff -Naur gallery-1.5-pl1/includes/ecard/templates/error.htm gallery-1.5.1/includes/ecard/templates/error.htm --- gallery-1.5-pl1/includes/ecard/templates/error.htm 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/includes/ecard/templates/error.htm 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,17 @@ + + + +E-C@rds - Errore + + +
+

+ +

+
+Error during processing the ecard!
+Please close this window and try again later, Thanks.
+ +
+ + diff -Naur gallery-1.5-pl1/includes/ecard/templates/leer.htm gallery-1.5.1/includes/ecard/templates/leer.htm --- gallery-1.5-pl1/includes/ecard/templates/leer.htm 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/includes/ecard/templates/leer.htm 2005-04-17 15:31:41.000000000 +0200 @@ -0,0 +1,9 @@ + + + +E-C@rds + + +

 

+ + diff -Naur gallery-1.5-pl1/includes/errors/configure_help.php gallery-1.5.1/includes/errors/configure_help.php --- gallery-1.5-pl1/includes/errors/configure_help.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/includes/errors/configure_help.php 2005-06-30 13:16:56.000000000 +0200 @@ -0,0 +1,3 @@ + +', '') ?> diff -Naur gallery-1.5-pl1/includes/errors/reconfigure.php gallery-1.5.1/includes/errors/reconfigure.php --- gallery-1.5-pl1/includes/errors/reconfigure.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/includes/errors/reconfigure.php 2005-07-19 22:57:20.000000000 +0200 @@ -0,0 +1,33 @@ + + + + + <?php echo _("Gallery needs Reconfiguration") ?> + + + + +
+

+ +

+ +

+ +

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

+
+ + + diff -Naur gallery-1.5-pl1/includes/errors/unconfigured.php gallery-1.5.1/includes/errors/unconfigured.php --- gallery-1.5-pl1/includes/errors/unconfigured.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/includes/errors/unconfigured.php 2005-07-19 22:57:20.000000000 +0200 @@ -0,0 +1,49 @@ + + + + + <?php echo _("Gallery Configuration Error") ?> + + + + +
+

+ +

+ +

+ + + + + + + + + + + + +
+ +

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

+
+ + + diff -Naur gallery-1.5-pl1/includes/slideshow/applet.cfg gallery-1.5.1/includes/slideshow/applet.cfg --- gallery-1.5-pl1/includes/slideshow/applet.cfg 2005-03-10 03:30:05.000000000 +0100 +++ gallery-1.5.1/includes/slideshow/applet.cfg 2005-09-13 00:40:46.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: applet.cfg,v 1.1.8.1 2005/03/10 02:30:05 cryptographite Exp $ + * $Id: applet.cfg,v 1.2.2.1 2005/09/12 22:40:46 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/includes/slideshow/applet.inc gallery-1.5.1/includes/slideshow/applet.inc --- gallery-1.5-pl1/includes/slideshow/applet.inc 2005-03-10 03:30:05.000000000 +0100 +++ gallery-1.5.1/includes/slideshow/applet.inc 2005-09-13 00:40:46.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: applet.inc,v 1.8.6.1 2005/03/10 02:30:05 cryptographite Exp $ + * $Id: applet.inc,v 1.9.2.1 2005/09/12 22:40:46 dmolavi Exp $ */ ?> '; } - echo makeIconMenu($iconElements, false); + echo makeIconMenu($iconElements, 'right', false); ?> 		- -
- - - - -
-app->show_flags !='yes') { - echo "\t\t". '"; -} -?> - -
-
- diff -Naur gallery-1.5-pl1/layout/navigator.inc gallery-1.5.1/layout/navigator.inc --- gallery-1.5-pl1/layout/navigator.inc 2004-12-14 19:43:40.000000000 +0100 +++ gallery-1.5.1/layout/navigator.inc 2005-08-08 22:23:11.000000000 +0200 @@ -1,4 +1,4 @@ - + $navigator["spread"]) { + $beginNextBlock = max(1, $navigator["page"] - 2 * $navigator["spread"]); + } + + if($end < $navigator["maxPages"]) { + $endNextBlock = min($navigator["page"] + 2 * $navigator["spread"], $navigator["maxPages"]); + } + // If the border color is not passed in, we do a white one if ($navigator["bordercolor"]) { $borderIn = $navigator["bordercolor"]; @@ -76,7 +84,11 @@ $ndrUrl=getImagePath('nav_dot_right.gif'); $ndUrl=getImagePath('nav_dot.gif'); - $mpContent = "\n\t\t"; + $mpContent = "\n\t\t". '
'; + if (isset($beginNextBlock)) { + $title = sprintf(_("Jump to page %d"), $beginNextBlock); + $mpContent .= "\n\t". ''; + } for ($i = $begin; $i <= $end; $i++) { if ($i == $current) { $number = ''. $i .''; @@ -98,7 +110,12 @@ $rightdot = 'rightdot'; } - $mpContent .="\n\t
... $rightdot 
"; + $mpContent .="\n\t		 $rightdot"; + if (isset($endNextBlock)) { + $title = sprintf(_("Jump to page %d"), $endNextBlock); + $mpContent .= '...'; + } + $mpContent .= '
'; } else { $mpContent =''; } diff -Naur gallery-1.5-pl1/layout/navmicro.inc gallery-1.5.1/layout/navmicro.inc --- gallery-1.5-pl1/layout/navmicro.inc 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/layout/navmicro.inc 2005-06-20 16:45:43.000000000 +0200 @@ -0,0 +1,141 @@ + +album->fields["nav_thumbs_first_last"],"yes") ) { + $navThumbsFirst = ''; + $navThumbsFirst .= $gallery->album->getThumbnailTagById($firstPage, + $gallery->album->fields["nav_thumbs_size"],"class=\"nav_micro_first_img\""); + $navThumbsFirst .=' '; + + $navThumbsLast =''; + $navThumbsLast .= $gallery->album->getThumbnailTagById($lastPage, + $gallery->album->fields["nav_thumbs_size"],"class=\"nav_micro_last_img\""); + $navThumbsLast .=' '; + +/* If first/last thumbs are disabled, fill each with a space. */ +} else { + $navThumbsFirst = ' '; + $navThumbsLast = ' '; +} + +/* If the "Dynamic" style is selected, generate it */ +if ( !strcmp($gallery->album->fields["nav_thumbs_style"],"dynamic") ) { + + /* Create a list of the previous thumbs, starting at the farthest back. */ + $navThumbsPrev = ''; + for ($i = $gallery->album->fields["nav_thumbs_prev_shown"]; $i >= 1; $i--) { + if ( $navpage-$i < 0 ) { continue; } + $prevPage = $navigator["allIds"][$navpage-$i]; + $navThumbsPrev .= ''; + $navThumbsPrev .= $gallery->album->getThumbnailTagById($prevPage, + $gallery->album->fields["nav_thumbs_size"],"class=\"nav_micro_img\""); + $navThumbsPrev .='  '; + } + + /* Create a list of the next thumbs, starting from right after current. */ + $navThumbsNext = ''; + for ($i = 1; $i <= $gallery->album->fields["nav_thumbs_next_shown"]; $i++) { + if ( $navpage+$i > $navcount-1 ) { break; } + $nextPage = $navigator["allIds"][$navpage+$i]; + $navThumbsNext .= '  '; + $navThumbsNext .= $gallery->album->getThumbnailTagById($nextPage, + $gallery->album->fields["nav_thumbs_size"],"class=\"nav_micro_img\""); + $navThumbsNext .=''; + } + + /* Create the current thumb. */ + $navThumbsCur = $gallery->album->getThumbnailTagById($navigator["allIds"][$navpage],($gallery->album->fields["nav_thumbs_size"] + +$gallery->album->fields["nav_thumbs_current_bonus"]),"class=\"nav_micro_current_img\""); +} + +/* If style is "Fixed" begin generation of fixed micro thumb navigation */ +if ( !strcmp($gallery->album->fields["nav_thumbs_style"],"fixed") ) { + + /* Add previous + next to get our image block size */ + $navBlockSize = $gallery->album->fields["nav_thumbs_next_shown"]+$gallery->album->fields["nav_thumbs_prev_shown"]; + if ( $navBlockSize <= 2 ) { $navBlockSize += 1; } + + /* Determine our starting point based on the image we are at. */ + if ( $navpage < $navBlockSize-1 ) { + $startThumb = 0; + + /* This will display the final images with the same number of thumbs as all others */ + /* Commenting it out allows the end to display just the remaining images. */ +/* Commented to only display remaining images at end + } elseif ( $navpage > $navcount-($navBlockSize-1) ) { + $startThumb = ($navcount-$navBlockSize) ? ($navcount-$navBlockSize) : 0; +*/ + + /* This is what displays anything that isn't at the beginning or end */ + } else { + $X = $navBlockSize-2; + $startThumb = $X * (int)(($navpage-1)/$X); + } + + /* After we have decided on a starting point, loop through and create them */ + $navBlogThumb = ''; + for ($i = $startThumb; $i < $navBlockSize+$startThumb; $i++) { + /* In case we are close to the end, stop generating thumbs */ + if ( $i >= $navcount ) { break; } + $navBlogThumb .= ''; + + /* Current image gets special CSS */ + if ( $i == $navpage ) { + $navBlogThumb .= $gallery->album->getThumbnailTagById($navigator["allIds"][$i], + $gallery->album->fields["nav_thumbs_size"]+$gallery->album->fields["nav_thumbs_current_bonus"] + ,"class=\"nav_micro_current_img\""); + /* All other images get another CSS */ + } else { + $navBlogThumb .= $gallery->album->getThumbnailTagById($navigator["allIds"][$i], + $gallery->album->fields["nav_thumbs_size"],"class=\"nav_micro_img\""); + } + $navBlogThumb .= ''; + $navBlogThumb .= '  '; + } +} +?> + + + border="0" cellspacing="0" cellpadding="0" class="modnavboxthumbs"> +
+ + + +album->fields["nav_thumbs_style"],"dynamic") ) { ?> + + + +album->fields["nav_thumbs_style"],"fixed") ) { ?> + + + + +
+
+ diff -Naur gallery-1.5-pl1/layout/navphoto.inc gallery-1.5.1/layout/navphoto.inc --- gallery-1.5-pl1/layout/navphoto.inc 2004-07-17 13:35:20.000000000 +0200 +++ gallery-1.5.1/layout/navphoto.inc 2005-08-08 22:23:11.000000000 +0200 @@ -1,84 +1,86 @@ - + direction == "ltr") { - $fpImgUrl= getImagePath('nav_first.gif'); - $ppImgUrl= getImagePath('nav_prev.gif'); - $npImgUrl= getImagePath('nav_next.gif'); - $lpImgUrl= getImagePath('nav_last.gif'); - } else { - $fpImgUrl= getImagePath('nav_last.gif'); - $ppImgUrl= getImagePath('nav_next.gif'); - $npImgUrl= getImagePath('nav_prev.gif'); - $lpImgUrl= getImagePath('nav_first.gif'); - } - - $firstPage = $navigator["allIds"][0]; - $lastPage = $navigator["allIds"][$navcount-1]; - - #-- 'first' and 'previous button cell --- - if ($navpage > 0) { - $fpContent = ''; - $fpContent .=''. $fpAltText .''; - $fpContent .=''; - - $prevPage = $navigator["allIds"][$navpage-1]; - $ppContent = ''; - $ppContent .=''. $ppAltText .''; - $ppContent .=''; - - $pClass='borderright'; - } else { - $fpContent=' '; - $ppContent=' '; - - $pClass=''; - } - - #-- 'page numbers' cell --- - $mpContent=sprintf(_("%d of %d"), $navpage+1, $navcount); - - #-- 'next' and 'last' button cell --- - if ($navpage < $navcount-1) { - $nextPage = $navigator["allIds"][$navpage+1]; - $npContent =''; - $npContent .=''. $npAltText .''; - $npContent .=''; - - $lpContent =''; - $lpContent .=''. $lpAltText .''; - $lpContent .=''; - - $nClass='borderleft'; - } else { - $npContent=' '; - $lpContent=' '; + // Calculate the beginning and ending of the navigator range + $begin = 0; + $navpage = sizeof($navigator["allIds"]) - 1; + $navpage = array_search($navigator["id"], $navigator["allIds"]); + $navcount = sizeof($navigator["allIds"]); + + // If the border color is not passed in, we do a white one + if ($navigator["bordercolor"]) { + $borderIn = $navigator["bordercolor"]; + } else { + $borderIn = "#FFFFFF"; + } + + if (isset($navigator["fullWidth"]) && isset($navigator["widthUnits"])) { + $width=' width="'. $navigator["fullWidth"] . $navigator["widthUnits"] .'"'; + } + + $fpAltText = _("First Photo"); + $ppAltText = _("Previous Photo"); + $npAltText = _("Next Photo"); + $lpAltText = _("Last Photo"); + + if ($gallery->direction == "ltr") { + $fpImgUrl = getImagePath('nav_first.gif'); + $ppImgUrl = getImagePath('nav_prev.gif'); + $npImgUrl = getImagePath('nav_next.gif'); + $lpImgUrl = getImagePath('nav_last.gif'); + } else { + $fpImgUrl = getImagePath('nav_last.gif'); + $ppImgUrl = getImagePath('nav_next.gif'); + $npImgUrl = getImagePath('nav_prev.gif'); + $lpImgUrl = getImagePath('nav_first.gif'); + } + + $firstPage = $navigator["allIds"][0]; + $lastPage = $navigator["allIds"][$navcount-1]; + + #-- 'first' and 'previous button cell --- + if ($navpage > 0) { + $fpContent = ''; + $fpContent .= ''. $fpAltText .''; + $fpContent .= ''; + + $prevPage = $navigator["allIds"][$navpage-1]; + $ppContent = ''; + $ppContent .= ''. $ppAltText .''; + $ppContent .= ''; + + $pClass= 'borderright'; + } else { + $fpContent = ' '; + $ppContent = ' '; + + $pClass = ''; + } + + #-- 'page numbers' cell --- + $mpContent=sprintf(_("%d of %d"), $navpage+1, $navcount); + + #-- 'next' and 'last' button cell --- + if ($navpage < $navcount-1) { + $nextPage = $navigator["allIds"][$navpage+1]; + $npContent = ''; + $npContent .= ''. $npAltText .''; + $npContent .= ''; + + $lpContent = ''; + $lpContent .= ''. $lpAltText .''; + $lpContent .= ''; + + $nClass = 'borderleft'; + } else { + $npContent = ' '; + $lpContent = ' '; - $nClass=''; - } + $nClass = ''; + } ?> diff -Naur gallery-1.5-pl1/layout/watermarkform.inc gallery-1.5.1/layout/watermarkform.inc --- gallery-1.5-pl1/layout/watermarkform.inc 2005-03-10 03:30:07.000000000 +0100 +++ gallery-1.5.1/layout/watermarkform.inc 2005-09-13 00:40:47.000000000 +0200 @@ -15,91 +15,89 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: watermarkform.inc,v 1.16.2.1 2005/03/10 02:30:07 cryptographite Exp $ + * $Id: watermarkform.inc,v 1.21.2.1 2005/09/12 22:40:47 dmolavi Exp $ */ -?> -app->watermarkSizes; - } -?> -

-"; + // get a list of watermarks -if ($wmDir = opendir($gallery->app->watermarkDir)) { - $found = 0; - $extensions = array ("png", "gif", "tif"); - $extensions_string = "png, gif, tif"; - while ($wmFile = readdir($wmDir)) { - $matches_ext = 0; - foreach ($extensions as $ext) { - if (eregi("\\.$ext$", $wmFile, $regs)) { - $matches_ext = 1; - } - } - if ($matches_ext) { - $found++; - if ($found == 1) { - // Start select form element on first matching file - print "" . _("Watermark") . ": "; - print "\n"; - } +if ($wmDir = opendir($gallery->app->watermarkDir)) { + $found = 0; + $extensions = array ("png", "gif", "tif"); + $extensions_string = "png, gif, tif"; + while ($wmFile = readdir($wmDir)) { + $matches_ext = 0; + foreach ($extensions as $ext) { + if (eregi("\\.$ext$", $wmFile, $regs)) { + $matches_ext = 1; + } + } + if ($matches_ext) { + $options[] = array('value' => $wmFile, 'text' => $wmFile); + } + } + closedir($wmDir); + + if(sizeof($options) > 0) { + echo "" . _("Watermark") . ": "; + + array_sort_by_fields(&$options, 'text', 'desc', false); + if ($watermarkForm["allowNone"]) { + $options[] = array('value' => '', 'text' => _("* No Watermark *"), 'selected' => true); + } + $options = array_reverse($options); + echo drawSelect2('wmName', $options, array(), array('prettyPrinting' => true)); + } + else { + $err = sprintf(_("No files matching %s found in %s"), + "" . $extensions_string . "", + "" . $gallery->app->watermarkDir . ""); + echo gallery_error($err); + } } else { - $err=sprintf (_("Could not open directory %s"), $gallery->app->watermarkDir); - echo gallery_error($err); + echo gallery_error(sprintf (_("Could not open directory %s"), $gallery->app->watermarkDir)); } ?>

@@ -143,20 +141,25 @@ user->canViewFullImages($gallery->album)) { ?> :
- - + + + + + +
> -
> -
>
>
- +
" . _("Watermark subalbums") . "

"; -} ?> - " . _("Watermark subalbums") . "

"; +} +echo _("Apply watermark to") ?> "; - foreach ($array as $uid => $username) { + $buf .= ""; + $buf .= "". $crlf; return $buf; } + +function drawSelect2($name, $options, $attrList = array(), $args = array()) { + $attrs = ''; + $crlf = (isset($args['prettyPrinting'])) ? "\n\t" : ''; + if (!isset($attrList['size'])) { + $attrList['size'] = 1; + } + + if (!empty($attrList)) { + foreach ($attrList as $attr => $value) { + if ($value != NULL) { + $attrs .= " $attr=\"$value\""; + } + } + } + + $buf = "". $crlf; + + return $buf; +} + /* * makeFormIntro() is a wrapper around makeGalleryUrl() that will generate * a
tag suitable for usage in either standalone or embedded mode. @@ -142,7 +185,7 @@ $attrs .= " $key=\"$value\""; } - $form = "\n"; + $form = "\n\n"; $args = split("&", $tmp); foreach ($args as $arg) { @@ -168,4 +211,50 @@ return !isset($_REQUEST[$name]); } +/* The code below was inspired from the Horde Framework (http://www.horde.org) +** It was taken from: framework/UI/UI/VarRenderer/html.php,v 1.106 +** Copyright 2003-2005 Jason M. Felice +** +** Jens Tkotz 25.04.2005 +*/ +function showColorpicker($attrs = array()) { + $args = array( + 'target' => $attrs['name'], + 'gallery_popup' => true + ); + + $colorPickerUrl = makeGalleryUrl('lib/colorpicker.php', $args); + $imgColorpicker = '
'; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= "'; + $html .= ''; + $html .= '
". $imgColorpicker .'
'; + + 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) { + global $gallery; + + if (empty($args['set_albumName'])) { + $args['set_albumName'] = $gallery->session->albumName; + } + $args['type'] = 'popup'; + return makeGalleryUrl($target, $args); +} + ?> diff -Naur gallery-1.5-pl1/lib/lang.php gallery-1.5.1/lib/lang.php --- gallery-1.5-pl1/lib/lang.php 2005-03-10 03:30:08.000000000 +0100 +++ gallery-1.5.1/lib/lang.php 2005-09-13 00:40:47.000000000 +0200 @@ -15,22 +15,29 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: lang.php,v 1.43.2.3 2005/03/10 02:30:08 cryptographite Exp $ + * $Id: lang.php,v 1.55.2.2 2005/09/12 22:40:47 dmolavi Exp $ */ -?> -0) { - $lang[0]=substr($lang[0],0,$spos); - } - - /* browser may send aa-bb, then we convert to aa_BB */ - $lang_pieces=explode ("-",$lang[0]); - if (strlen($lang[0]) >2) { - $browserLang=strtolower($lang_pieces[0]). "_".strtoupper($lang_pieces[1]) ; - } else { - $browserLang=$lang[0]; - } + /* Maybe there are some extra infos we dont need, so we strip them. */ + $spos = strpos($lang[0],";"); + if ($spos >0) { + $lang[0] = substr($lang[0],0,$spos); } - else { - $browserLang=false; + + /* browser may send aa-bb, then we convert to aa_BB */ + $lang_pieces = explode ("-",$lang[0]); + if (strlen($lang[0]) >2) { + $browserLang=strtolower($lang_pieces[0]). "_".strtoupper($lang_pieces[1]) ; + } else { + $browserLang = $lang[0]; } + } + else { + $browserLang = false; + } - return $browserLang; + return $browserLang; } -/* -** Set Gallery Default: -** - language -** - charset -** - direction -** - alignment +/** + * Set Gallery Default: + * - language + * - charset + * - direction + * - alignment */ function setLangDefaults($nls) { global $gallery; @@ -86,26 +93,29 @@ $gallery->align = $nls['default']['alignment']; } -/* -** This function tries to get the languge given by the Environment. -** if no language is found, or Gallery was not able to get it, NULL is returned. -*/ +/** + * This function tries to get the languge given by the Environment. + * @return mixed The language the environment uses, or NULL if Gallery was not able to get it. + * @author Jens Tkotz + */ function getEnvLang() { - global $GALLERY_EMBEDDED_INSIDE_TYPE; - global $board_config; /* Needed for phpBB2 */ - global $_CONF; /* Needed for GeekLog */ - global $mosConfig_locale; /* Needed for Mambo */ - global $currentlang; /* Needed for CPGNuke */ + global $board_config; /* Needed for phpBB2 */ + global $_CONF; /* Needed for GeekLog */ + global $mosConfig_locale, $mosConfig_lang; /* Needed for Mambo */ + global $currentlang; /* Needed for CPGNuke */ $envLang = NULL; switch ($GALLERY_EMBEDDED_INSIDE_TYPE) { case 'postnuke': - if (isset($_SESSION['PNSVlang'])) { + if (!empty($_SESSION['PNSVlang'])) { $envLang = $_SESSION['PNSVlang']; } + else { + $envLang = pnSessionGetVar('lang'); + } break; case 'phpnuke': @@ -113,13 +123,12 @@ if (isset($_COOKIE['lang'])) { $envLang = $_COOKIE['lang']; } - break; case 'phpBB2': if (isset($board_config['default_lang'])) { $envLang = $board_config['default_lang']; - } + } break; case 'GeekLog': @@ -128,34 +137,37 @@ $envLang = $_CONF['language']; } else if (isset($_CONF['locale'])) { $envLang = $_CONF['locale']; - } + } break; case 'mambo': - if (isset($mosConfig_locale)){ - $envLang = $mosConfig_locale; - } + $envLang = $mosConfig_lang; + if (! getLanguageAlias($envLang)) { + if (isset($mosConfig_locale)){ + $envLang = $mosConfig_locale; + } + } break; case 'cpgnuke': if (isset($currentlang)){ $envLang = $currentlang; - } + } break; default: - return NULL; + $envLang = NULL; break; } return $envLang; } -/* -** In some Environments we dont want to allow the user -** to change the language. -** In this case we override Mode 3 with Mode 1 and -** Gallery runs in the language the Environment use. +/** + * In some Environments we dont want to allow the user + * to change the language. + * In this case we override Mode 3 with Mode 1 and + * Gallery runs in the language the Environment use. */ function forceStaticLang() { global $GALLERY_EMBEDDED_INSIDE_TYPE; @@ -168,6 +180,9 @@ } } +/** + * +*/ function initLanguage($sendHeader=true) { static $languages_initialized = false; @@ -207,14 +222,11 @@ return; } - /* ** Does the user wants a new lanuage ? ** This is used in Standalone and *Nuke */ - if (isset($_GET['newlang'])) { - $newlang=$_GET['newlang']; - } + $newlang = getRequestVar('newlang'); /** ** Note: ML_mode is only used when not embedded @@ -283,9 +295,7 @@ } // if an alias for the (new or Env) language is given, use it - if (isset($nls['alias'][$gallery->language])) { - $gallery->language = $nls['alias'][$gallery->language] ; - } + getLanguageAlias($gallery->language) ; /** ** Fall back to Default Language if : @@ -363,7 +373,7 @@ **/ if (gettext_installed()) { - $bindtextdomain=bindtextdomain($gallery->language. "-gallery_". where_i_am(), dirname(dirname(__FILE__)) . '/locale'); + bindtextdomain($gallery->language. "-gallery_". where_i_am(), dirname(dirname(__FILE__)) . '/locale'); textdomain($gallery->language. "-gallery_". where_i_am()); } elseif (!$languages_initialized) { @@ -392,9 +402,9 @@ return $translationfile; } -/* Substitute ngettext function -** NOTE: this is the first primitive Step !! -** It fully ignores the plural definition !! +/** Substitute ngettext function + * NOTE: this is the first primitive Step !! + * It fully ignores the plural definition !! */ function emulate_ngettext() { @@ -456,6 +466,9 @@ } } +/** + * +*/ function emulate_gettext() { global $translation; global $gallery; @@ -514,53 +527,74 @@ } } - -/* returns all languages in this gallery installation */ +/** + * @return array All languages in this gallery installation + * @author Jens Tkotz + */ function gallery_languages() { $nls = getNLS(); return $nls['language']; } -/* returns all language relative that gallery could collect. */ +/** + * This function tries to find an alias for an given "language". + * Given language is set to Alias if found. + * @param string $language + * @return boolean true if Alias was found and set. + * @author Jens Tkotz + */ +function getLanguageAlias(& $language) { + $nls = getNLS(); + + if (isset($nls['alias'][$language])) { + $language = $nls['alias'][$language]; + return true; + } else { + return false; + } +} + +/** + * returns all language relative that gallery could collect. + */ function getNLS() { - static $nls; + static $nls; - if (empty($nls)) { - $nls = array(); - // Load defaults - include (dirname(dirname(__FILE__)) . '/nls.php'); - - $modules = array('config','core'); - $dir = dirname(dirname(__FILE__)) . '/locale'; - if (fs_is_dir($dir) && is_readable($dir) && $handle = fs_opendir($dir)) { - while ($dirname = readdir($handle)) { - if (ereg("^([a-z]{2}_[A-Z]{2})", $dirname)) { - $locale = $dirname; - $fc = 0; - foreach ($modules as $module) { - if (gettext_installed()) { - if (fs_file_exists(dirname(dirname(__FILE__)) . "/locale/$dirname/$locale-gallery_$module.po")) $fc++; - } else { - if (fs_file_exists(dirname(dirname(__FILE__)) . "/locale/$dirname/LC_MESSAGES/$locale-gallery_$module.mo")) $fc++; + if (empty($nls)) { + $nls = array(); + // Load defaults + include (dirname(dirname(__FILE__)) . '/nls.php'); + + $modules = array('config','core'); + $dir = dirname(dirname(__FILE__)) . '/locale'; + if (fs_is_dir($dir) && is_readable($dir) && $handle = fs_opendir($dir)) { + while ($dirname = readdir($handle)) { + if (ereg("^([a-z]{2}_[A-Z]{2})", $dirname)) { + $locale = $dirname; + $fc = 0; + foreach ($modules as $module) { + if (gettext_installed()) { + if (fs_file_exists(dirname(dirname(__FILE__)) . "/locale/$dirname/$locale-gallery_$module.po")) $fc++; + } else { + if (fs_file_exists(dirname(dirname(__FILE__)) . "/locale/$dirname/LC_MESSAGES/$locale-gallery_$module.mo")) $fc++; + } + } + if (fs_file_exists(dirname(dirname(__FILE__)) . "/locale/$dirname/$locale-nls.php") && $fc==sizeof($modules)) { + include (dirname(dirname(__FILE__)) . "/locale/$dirname/$locale-nls.php"); + } + } } - } - if (fs_file_exists(dirname(dirname(__FILE__)) . "/locale/$dirname/$locale-nls.php") && $fc==sizeof($modules)) { - include (dirname(dirname(__FILE__)) . "/locale/$dirname/$locale-nls.php"); - } + closedir($handle); } - } - closedir($handle); } - } - return $nls; + return $nls; } function i18n($buf) { return $buf; } - function isSupportedCharset($charset) { $supportedCharsets=array( 'UTF-8', @@ -581,11 +615,11 @@ ); /* - ** Check if we are using PHP >= 4.1.0 - ** If yes, we can use 3rd Parameter so e.g. titles in chinese BIG5 or UTF8 are displayed correct. - ** Otherwise they are messed. - ** Not all Gallery Charsets are supported by PHP, so only thoselisted are recognized. - */ + * Check if we are using PHP >= 4.1.0 + * If yes, we can use 3rd Parameter so e.g. titles in chinese BIG5 or UTF8 are displayed correct. + * Otherwise they are messed. + * Not all Gallery Charsets are supported by PHP, so only thoselisted are recognized. + */ if (function_exists('version_compare')) { if ( (version_compare(phpversion(), "4.1.0", ">=") && in_array($charset, $supportedCharsets)) || (version_compare(phpversion(), "4.3.2", ">=") && in_array($charset, $supportedCharsetsNewerPHP)) ) { @@ -600,10 +634,11 @@ } } -/* Gallery Version of htmlentities -** Enhancement: Depending on PHP Version and Charset use -** optional 3rd Parameter of php's htmlentities -*/ +/** + * Gallery Version of htmlentities + * Enhancement: Depending on PHP Version and Charset use + * optional 3rd Parameter of php's htmlentities + */ function gallery_htmlentities($string) { global $gallery; @@ -614,14 +649,14 @@ } } -/* -** Convert all HTML entities to their applicable characters -*/ -function unhtmlentities ($string) { +/** + * Convert all HTML entities to their applicable characters + */ +function unhtmlentities($string) { global $gallery; if (empty($string)) { - return ""; + return ''; } if (function_exists('html_entity_decode')) { @@ -651,7 +686,8 @@ return $return; } -/* These are custom fields that are turned on and off at an album +/** + * These are custom fields that are turned on and off at an album * level, and are populated for each photo automatically, without the * user typing values. The $value of each pair should be translated * as appropriate in the ML version. @@ -664,9 +700,9 @@ 'EXIF' => _("Additional EXIF Data")); } -/* These are custom fields which can be entered manual by the User -** Since they are used often, we translated them. -*/ +/** These are custom fields which can be entered manual by the User + * Since they are used often, we translated them. + */ function translateableFields() { return array( 'Title' => _("Title"), @@ -676,4 +712,128 @@ ); } -?> +/** + * This "block" returns either a combobox with available languages or show flags for them. + * Both are only displayed if at least 2 languages are available. + * @author Jens Tkotz + */ +function languageSelector() { + global $gallery, $GALLERY_EMBEDDED_INSIDE, $GALLERY_EMBEDDED_INSIDE_TYPE; + + $html = ''; + + if ($gallery->app->ML_mode == 3 && !$gallery->session->offline && sizeof($gallery->app->available_lang) > 1) { + if($gallery->app->show_flags !='yes') { + $html .= ''; + } + + $html .= makeFormIntro('#', array('name' => 'MLForm', 'class' => 'MLForm')); + $langSelectTable = new galleryTable(); + $langSelectTable->setColumnCount(20); + $langSelectTable->setAttrs(array('class' => 'languageSelector', 'align' => 'right')); + + $nls = getNLS(); + + foreach ($gallery->app->available_lang as $value) { + /** + * We only allow show languages which are available in gallery. + * These could differ to the languages defined in config.php. + */ + if (! isset($nls['language'][$value])) continue; + + if (isset($GALLERY_EMBEDDED_INSIDE) && $GALLERY_EMBEDDED_INSIDE=='nuke') { + if ($GALLERY_EMBEDDED_INSIDE_TYPE == 'postnuke') { + /* postnuke */ + if (! isset($nls['postnuke'][$value])) continue; + $new_lang = $nls['postnuke'][$value]; + } + else { + /* phpNuke, nsnNuke or cpgNuke */ + if (! isset($nls['phpnuke'][$value])) continue; + $new_lang = $nls['phpnuke'][$value]; + } + } else { + $new_lang = $value; + } + + /* now we build the URL according to the new language */ + $request_url = $_SERVER['REQUEST_URI']; + $pos = strpos($request_url, "newlang"); + if ($pos >0) { + $request_url = substr($request_url,0,$pos-1); + } + + $url = htmlspecialchars(addUrlArg($request_url, "newlang=$new_lang")); + + /* Show pulldown or flags */ + if($gallery->app->show_flags !='yes') { + $options[$url] = $nls['language'][$value]; + } + else { + $flagname = $value; + $flagImage = "app->photoAlbumURL . "/locale/$flagname/flagimage/$flagname.gif\" alt=\"" .$nls['language'][$value] . "\" title=\"" .$nls['language'][$value] . "\">"; + + if ($gallery->language != $value) { + $langSelectTable->addElement(array('content' => "$flagImage")); + } + else { + $langSelectTable->addElement(array( + 'content' => $flagImage, + 'cellArgs' => array('style' => 'padding-bottom:10px') + )); + } + } + } + + if($gallery->app->show_flags !='yes') { + $content = drawSelect('newlang', + $options, + $nls['language'][$gallery->language], + 1, + array('style' => 'font-size:8pt;', 'onChange' => 'ML_reload()'), + true); + $langSelectTable->addElement(array('content' => $content)); + } + + $html .= $langSelectTable->render(); + $html .= '
'; + } + return $html; +} + +/** + * @return string + * @author Jens Tkotz + */ +function langLeft() { + global $gallery; + + if ($gallery->direction == 'ltr') { + return 'left'; + } + else { + return 'right'; + } +} + + +/** + * @return string + * @author Jens Tkotz + */ +function langRight() { + global $gallery; + + if ($gallery->direction == 'ltr') { + return 'right'; + } + else { + return 'left'; + } +} +?> \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/lib/mail.php gallery-1.5.1/lib/mail.php --- gallery-1.5-pl1/lib/mail.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/lib/mail.php 2005-09-15 17:46:29.000000000 +0200 @@ -0,0 +1,292 @@ + +app->photoAlbumURL). + " \r\n". + sprintf(_("Report abuse to %s"),$gallery->app->adminEmail)); + $msg2 = sprintf("Note: This is an automatically generated email message sent from the %s website. If you have received this in error, please ignore this message. \r\nReport abuse to %s", + $gallery->app->photoAlbumURL, $gallery->app->adminEmail); + + if ($msg != $msg2) { + return "\r\n\r\n$msg\r\n\r\n$msg2"; + } else { + return "\r\n\r\n$msg"; + } +} + +/** + * This function is a wrapper around the Mail classes + * It has currently the same structure as gallery_mail_old + * Return is true when succesfully send, otherise false + * Errormessages are printed immediately + */ +function gallery_mail($to, $subject, $msg, $logmsg, $hide_recipients = false, $from = NULL, $isNotifyMail = false, $isHTML = false) { + global $gallery; + $bcc = array(); + + if(!is_array($to)) { + $to = array($to); + } + /* Begin Catch errors */ + if ($gallery->app->emailOn == "no") { + echo "\n
". gallery_error(_("Email not sent as it is disabled for this gallery")); + return false; + } + + foreach($to as $rcpnr => $mail) { + if (! check_email($mail)) { + echo "\n
". gallery_error(sprintf(_("Email not sent to %s as it is not a valid address"), + '' . $mail . "")); + unset ($to[$rcpnr]); + } + } + + if (empty($to)) { + echo "\n
". gallery_error(_("Email not sent as no reciepient address provided")); + return false; + } + + if ($hide_recipients) { + $bcc = $to; + $to = array(); + } + + if (! check_email($from)) { + if (isDebugging() && $from) { + echo "\n
". gallery_error(sprintf(_("Sender address %s is invalid, using %s."), + $from, $gallery->app->senderEmail)); + } + $from = $gallery->app->senderEmail; + $reply_to = $gallery->app->adminEmail; + } else { + $reply_to = $from; + } + + /* End catch errors */ + + if(!empty($gallery->app->emailSubjPrefix)) { + $subject = $gallery->app->emailSubjPrefix .' '. $subject; + } + + if (isset($gallery->app->email_notification) && + in_array("bcc", $gallery->app->email_notification)) { + $bcc[] = $gallery->app->adminEmail; + } + + if (get_magic_quotes_gpc()) { + $msg = stripslashes($msg); + } + + $gallery_mail = new htmlMimeMail(); + + $gallery_mail->setSubject($subject); + + if($isHTML) { + $gallery_mail->setHtmlCharset($gallery->charset); + $gallery_mail->setHtml($msg, + _("This is a HTML mail, please have a look at the Attachment.")); + } + else { + $gallery_mail->setText($msg); + } + $gallery_mail->setFrom($from); + $gallery_mail->setReturnPath($reply_to); + + /* As bccs are set as headers, they nead to be a string. Converting former array. */ + if (!empty($bcc)) { + $gallery_mail->setBcc(implode(", ", $bcc)); + } + + if ($gallery->app->useOtherSMTP == "yes") { + $gallery_mail->setSMTPParams( + $gallery->app->smtpHost, + $gallery->app->smtpPort, + $gallery->app->smtpUserName, + FALSE, + $gallery->app->smtpUserName, + $gallery->app->smtpPassword + ); + } + + + $result = $gallery_mail->send($to, ($gallery->app->useOtherSMTP != "yes") ? 'mail' : 'smtp'); + + if(! $isNotifyMail) { + emailLogMessage($logmsg, $result, $isNotifyMail); + } + + return $result; +} + + +function welcome_email($show_default=false) { + global $gallery; + + $default=_("Hi !!FULLNAME!!, + +Congratulations. You have just been subscribed to %s at %s. Your account name is !!USERNAME!!. Please visit the gallery soon, and create a password by clicking this link: + +!!NEWPASSWORDLINK!! + +Gallery @ %s Administrator."); + if ($show_default) { + return sprintf($default, + "<" . _("gallery title") . ">", + "<" . _("gallery URL") . ">", + "<" . _("gallery title") . ">"); + } elseif (empty($gallery->app->emailGreeting)) { + return sprintf($default, + $gallery->app->galleryTitle, + $gallery->app->photoAlbumURL, + $gallery->app->galleryTitle); + } else { + return $gallery->app->emailGreeting; + } + +} + +function welcomeMsgPlaceholderList() { + + $placeholders = array( + 'galleryurl' => _("The Url to your Gallery."), + 'gallerytitle' => _("Title of your Gallery."), + 'adminemail' => _("Admin email(s)"), + 'password' => _("Password for the newly created user."), + 'username' => _("Username"), + 'fullname' => _("Fullname"), + 'newpasswordlink' => _("Will be replaced by a link the new user can click on to create a new password.") + ); + + return $placeholders; +} + +/** + * This function substitutes placeholder like !!USERNAME!! + * with the corresponding value in the welcome message for new users. + */ +function resolveWelcomeMsg($placeholders = array()) { + global $gallery; + $welcomeMsg = welcome_email(); + + $placeholders['galleryurl'] = $gallery->app->photoAlbumURL; + $placeholders['gallerytitle'] = $gallery->app->galleryTitle; + $placeholders['adminemail'] = $gallery->app->adminEmail; + + foreach (welcomeMsgPlaceholderList() as $key => $trash) { + $welcomeMsg = str_replace('!!'. strtoupper($key) .'!!', + isset($placeholders[$key]) ? $placeholders[$key] : '', $welcomeMsg); + } + + return $welcomeMsg; +} + +/** + * This functions sends a notification to all people that request an email when a comment was added + * to an item. + * @param string $photoid + * @param string $comment_text + * @param string $commenter_name + */ +function emailComments($id, $comment_text, $commenter_name) { + global $gallery; + + $to = $gallery->album->getEmailMeList('comments', $id); + $subject = sprintf(_("New comment for %s"), $id); + $text = ''; + + if (!empty($to)) { + $text .= ''; + $text .= "\n\n"; + $text .= "\n "; + $text .= "\n $subject"; + $text .= "\n \n\n

"; + $text .= sprintf(_("A new comment has been added to Gallery: %s"), $gallery->app->galleryTitle); + $text .= "\n

"; + $text .= sprintf(_("The comment was added by %s to this %s in this %s."), + $commenter_name, + ''. _("Item") .'', + ''. _("Album") .''; + $text .= "\n
". _("*** Begin comment ***")."
\n"; + $text .= nl2br($comment_text); + $text .= "
\n". _("***End comment ***") . "\n

\n"; + $text .= _("If you no longer wish to receive emails about this image, follow the links above and ensure that 'Email me when comments are added' is unchecked in both the photo and album page (You'll need to login first)."); + $text .= "\n

\n\n"; + + $logmsg = sprintf(_("New comment for %s."), makeAlbumHeaderUrl($gallery->session->albumName, $id)); + + gallery_mail($to, $subject, $text, $logmsg, true, NULL, false, true); + } + elseif (isDebugging()) { + } +} + +function emailLogMessage($logmsg, $result, $isNotifyMail) { + global $gallery; + if (!$result) { + $logmsg = sprintf(_("FAILED") ." / FAILED: %s", $logmsg); + } + if (isset($gallery->app->email_notification) && + in_array("logfile", $gallery->app->email_notification)) { + $logfile = $gallery->app->userDir."/email.log"; + logMessage($logmsg, $logfile); + } + + if (isset($gallery->app->email_notification) && + in_array("email", $gallery->app->email_notification)) { + $subject = _("Email activity"); + if ($subject != "Email activity") { + $subject .= "/Email activity"; + } + $subject .= ": ". $gallery->app->galleryTitle; + $subject = unhtmlentities($subject); + + gallery_mail($gallery->app->adminEmail, + $subject, + $logmsg . emailDisclaimer(), + '', + false, + $gallery->app->senderEmail, + true + ); + } +} +?> \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/lib/messages.php gallery-1.5.1/lib/messages.php --- gallery-1.5-pl1/lib/messages.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/lib/messages.php 2005-09-13 00:40:47.000000000 +0200 @@ -0,0 +1,88 @@ + +'. _("Error:") . " $message\n"; +} + +function infoLine($messages, $type = '') { + $class = (!empty($type)) ? "infoline_$type" : ''; + + $message = (is_array($messages)) ? implode("
\n", $messages) : $messages; + + if(!empty($message)) { + return "
$message
\n"; + } else { + return ''; + } +} + +function errorRow($key) { + global $gErrors; + + if (isset($gErrors[$key])) { + $error = $gErrors[$key]; + } else { + $error = NULL; + } + if ($error) { + include(dirname(dirname(__FILE__)) . "/html/errorRow.inc"); + } +} + +function processingMsg($buf) { + echo "\n
$buf"; + my_flush(); +} + +/* returns the offical name of the gallery */ +function Gallery() { + return "Gallery"; +} + +function poweredBy () { + global $gallery; + $link = ''.Gallery().''; + if (isDebugging() || $gallery->app->devMode == "yes" || $gallery->user->isAdmin()) { + $version = $gallery->version; + } else { + $version = "1"; + } + + if ($gallery->session->offline) { + return sprintf(_("Generated by %s v%s"), $link, $version); + } else { + return sprintf(_("Powered by %s v%s"), $link, $version); + } +} + +function debugMessage($msg, $file, $line, $level = NULL) { + global $gallery; + + if (isDebugging($level)) { + echo "\n
". basename($file) ."::$line -> $msg
\n"; + } +} + +?> diff -Naur gallery-1.5-pl1/lib/popup.php gallery-1.5.1/lib/popup.php --- gallery-1.5-pl1/lib/popup.php 2004-10-06 18:37:02.000000000 +0200 +++ gallery-1.5.1/lib/popup.php 2005-07-13 03:44:44.000000000 +0200 @@ -1,5 +1,4 @@ session->offline) && $online_only ) { return null; } @@ -86,4 +97,4 @@ \ Pas de fin de ligne à la fin du fichier. +?> diff -Naur gallery-1.5-pl1/lib/setup.php gallery-1.5.1/lib/setup.php --- gallery-1.5-pl1/lib/setup.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/lib/setup.php 2005-09-13 00:40:47.000000000 +0200 @@ -0,0 +1,1740 @@ + +*'; + } + if ($fields[3] == "block_element") { + $buf .= "\n$f0".$fields[1].""; + } else if ($fields[3] == "block_start") { + $buf .= "\n"; + $buf .= "\n"; + $buf .= "\n\t"; + $buf .= "\n
$f0

"; + $buf .= "\n\t".$fields[2]."

"; + } else if ($fields[3] == "block_end") { + $buf .= "\n"; + } else { + $buf .= "\n"; + $buf .= "\n\t$fields[0]"; + $buf .= "\n\t$fields[1]"; + $buf .= "\n"; + $buf .= "\n"; + if (!empty($fields[2])) { + $buf .= "\n\t$fields[2]"; + $buf .= "\n\n"; + } + } + + return $buf; +} + +function make_attrs($attrList) { + $attrs = ''; + if ($attrList) { + /* + ** I commented this out, because it produces non valid html for textareas. + ** 06.04.2004, Jens Tkotz + if (!isset($attrList["size"])) { + $attrList["size"] = 40; + } + */ + + foreach ($attrList as $attrKey => $attrVal) { + $attrs .= "$attrKey=\"$attrVal\" "; + } + } + return $attrs; +} + +function make_fields($key, $arr) { + if (isset($arr['prompt'])) { + $col1 = $arr['prompt']; + } else { + $col1 = ''; + } + if (isset($arr['type']) && + ($arr['type'] == 'text' || $arr['type'] == 'hidden' || $arr['type'] == 'checkbox')) { + $col2 = form_input($key, $arr); + } else if (isset($arr['choices'])) { + $col2 = form_choice($key, $arr); + } else if (isset($arr['multiple_choices'])) { + $col2 = form_multiple_choice($key, $arr); + } else if (isset($arr['type']) && $arr['type'] == 'textarea') { + $col2 = form_textarea($key, $arr); + } else if (isset($arr['type']) && $arr['type'] == 'table_values') { + $col2 = form_table_values($key, $arr); + } else if (isset($arr['type']) && $arr['type'] == 'colorpicker') { + $arr['name'] = $key; + $col2 = showColorpicker($arr); + } else if (isset($arr['type']) && $arr['type'] == 'password') { + $col2 = form_password($key, $arr); + } else if (isset($arr['type']) && $arr['type'] == 'nv_pairs') { + $col2 = form_nv_pairs($key, $arr); + } else if (isset($arr['type']) && $arr['type'] == 'print_services') { + $col2 = form_print_services($key, $arr); + } else { + $col2 =''; + } + if (isset($arr['desc'])) { + $col3 = $arr['desc']; + } else { + $col3 = ''; + } + $col4 = isset($arr['type']) ? $arr['type'] : NULL; + $col5 = isset($arr['required']) ? true : NULL; + + return array($col1, $col2, $col3,$col4,$col5); +} + +function form_textarea($key, $arr) { + $attrs = make_attrs($arr["attrs"]); + return ""; +} + +function form_input($key, $arr) { + $type = (isset($arr['type'])) ? 'type="'.$arr['type'].'"' : ''; + + $attrs = (isset($arr['attrs'])) ? make_attrs($arr['attrs']) : ''; + + $name = (isset($arr['name'])) ? $arr['name'] : $key; + + return ""; +} + +function form_password($key, $arr) { + if (isset($arr["attrs"])) { + $attrs = make_attrs($arr["attrs"]); + } else { + $attrs = ''; + } + + if (empty($arr['value'])) { + $arr['value'] = array('', '', '', ''); + } elseif (!is_array($arr['value'])) { + $arr['value'] = array($arr['value'], $arr['value'], $arr['value'], $arr['value']); + } + return " " + . '
' + . " " + . _('Please retype your password here') + . "\n" + . "\n"; +} + +function form_nv_pairs($key, $arr) { + if (isset($arr["attrs"])) { + $attrs = make_attrs($arr["attrs"]); + } else { + $attrs = ''; + } + $x=0; + $buf="\n" + . "" + . "" + . "" + . ""; + foreach ($arr["value"] as $result) { + $name=$result["name"]; + $value=$result["value"]; + $buf .= '' + . '\n"; + $buf .= '" + . "\n"; + $x++; + if ($x >= $arr["size"]) { + break; + } + } + for (; $x<$arr["size"]; $x++) { + $buf .= '\n"; + $buf .= '\n"; + } + $buf.="
". _("Name") . "". _("Value") ."
"; + return $buf; +} + +function form_choice($key, $arr) { + + $buf = "\n\t\n"; + return $buf; +} + +function form_multiple_choice($key, $arr) { + if (empty($arr["multiple_choices"])) { + return _("No content"); + } + + $buf= '\n"; + if (isset($arr['multiple_choices']['addon'])) { + $buf .="\n"; + } + $buf .="
'; + $count=0; + $column=0; + foreach ($arr["multiple_choices"] as $item => $value) { + if ($item == 'addon') continue; + if ($count%15 ==0) { + $buf .= ""; + } + $count++; + $column++; + $selected = ""; + if (is_array($arr["value"]) && in_array($item, $arr["value"])) { + $selected = "CHECKED"; + } + $buf .= "\n\t
" . $value ; + } + $buf .="
++". $arr['multiple_choices']['addon'] . "\n++
"; + return $buf; +} + +function makeMultipleChoiceContent($array) { + $multipleChoiceContent = array(); + + foreach($array as $key => $content) { + $multipleChoiceContent[$key] = ''. $content['name'] .''; + if (isset($content['description'])) { + $multipleChoiceContent[$key] .= ' '. $content['description']; + } + } + + return $multipleChoiceContent; +} + +/* in progress */ +function form_table_values($key, $arr) { + if (empty($arr['elements'])) { + return _("No content"); + } + + $jTable = new galleryTable(); + + $jTable->setHeaders($arr['columns']); + $jTable->setColumnCount(sizeof($arr['columns'])); + + foreach($arr['elements'] as $element) { + $jTable->addElement(array('content' => $element)); + } + + return $jTable->render(); +} + +function form_print_services($key, $arr) { + + $buf= "\n\t"; + foreach ($arr['services'] as $item => $data) { + if (isset($arr['value'][$item])) { + if (is_array($arr['value'][$item])) { + $value = $arr['value'][$item]; + if (!isset($value['checked'])) { + $value['checked'] = false; + } + } else { + $value = array('checked' => true); + } + } else { + $value = array('checked' => false); + } + $checked = $value['checked'] ? ' checked' : ''; + $buf .= "\n\t\t"; + } + $buf .="\n\t
\n\t\t\t${data['name']}"; + if (!empty($data['desc'])) { + $buf .= ' - ' . $data['desc']; + } + $buf .= "\n\t\t
\n\t"; + return $buf; +} + +function getPath() { + + /* Start with the server user's path */ + if (getOS() != OS_WINDOWS) { + $path = explode(":", getenv('PATH')); + } + else { + $path = explode(';', getenv('PATH')); + } + + /* Add in a few relatively obvious locations */ + $path[] = "/usr/local/gallery"; + $path[] = "/usr/local/gallery/bin"; + $path[] = "/usr/local/gallery/jhead"; + $path[] = "/usr/local/gallery/netpbm"; + $path[] = "/usr/local/bin"; + $path[] = "/usr/local/bin/jhead"; + $path[] = "/usr/local/bin/netpbm"; + $path[] = "/usr/local/netpbm"; + $path[] = "/usr/local/netpbm/bin"; + $path[] = "/usr/local/jhead"; + $path[] = "/usr/local/jhead/bin"; + $path[] = "/usr/bin/gallery"; + $path[] = "/usr/bin/gallery/jhead"; + $path[] = "/usr/bin/gallery/netpbm"; + $path[] = GALLERY_BASE . "/netpbm"; + $path[] = GALLERY_BASE . "/bin"; + $path[] = GALLERY_BASE . "/bin/netpbm"; + $path[] = GALLERY_BASE . "/bin/jhead"; + + return $path; +} + +function locateDir($filename, $extraDir = '', $ignorePath = false) { + if (fs_file_exists("$extraDir/$filename")) { + return $extraDir; + } + + if ($ignorePath) { + return ''; + } + + foreach (getPath() as $path) { + if (fs_file_exists("$path/$filename") && !empty($path)) { + return $path; + } + } +} + +function locateFile($filename) { + foreach (getPath() as $path) { + if (fs_file_exists("$path/$filename") && !empty($path)) { + return "$path/$filename"; + } + } +} + +function one_constant($key, $value) { + return "\$gallery->app->$key = \"{$value}\";\n"; +} + +function array_constant($key, $value) { + $buf=""; + foreach ($value as $item) { + $buf .= "\$gallery->app->${key}[] = \"{$item}\";\n"; + } + return $buf; +} + +function defaults($key, $value) { + return "\$gallery->app->default[\"$key\"] = \"$value\";\n"; +} + +function use_feature($feature) { + return "\$gallery->app->feature[\"$feature\"] = 1;\n"; +} + +function no_feature($feature, $cause) { + return "\$gallery->app->feature[\"$feature\"] = 0; // ($cause)\n"; +} + +function error_missing($desc, $key) { + if (empty($desc)) { + $desc=$key; + } + return gallery_error("// " . _("Missing value") . ": $desc!"); +} + +function error_row_wrap($buf) { + return "// $buf"; +} + +function check_exec() { + $disabled = "" . ini_get("disable_functions"); + + $success = array(); + $fail = array(); + $warn = array(); + if (!empty($disabled)) { + foreach(explode(',', $disabled) as $disabled_func) { + if(eregi('^exec$', $disabled_func)) { + $fail["fail-exec"] = 1; + } + } + } + + if (empty($fail['fail-exec'])) { + $success[] = _("exec() is not disabled on this server."); + } + + return array($success, $fail, $warn); +} + +function check_htaccess() { + global $GALLERY_PHP_VALUE_OK; + + /* + * the .htaccess file in the parent directory tries to + * auto_prepend the got-htaccess.php file. If that worked, + * then GALLERY_PHP_VALUE_OK will be set. + */ + $success = array(); + $fail = array(); + $warn = array(); + if ($GALLERY_PHP_VALUE_OK) { + $success[] = _("I can read your .htaccess file."); + } else { + $fail["fail-htaccess"] = 1; + } + + return array($success, $fail, $warn); +} + +function check_php() { + global $MIN_PHP_MAJOR_VERSION; + + $version = phpversion(); + $success = array(); + $fail = array(); + $warn = array(); + + if (!function_exists('version_compare') || !version_compare($version, "4.1.0", ">=")) { + $fail['fail-too-old'] = 1; + } else { + $success[] = sprintf(_("PHP v%s is OK."), $version); + } + + return array($success, $fail, $warn); +} +function check_mod_rewrite() { + global $GALLERY_REWRITE_OK; + + $success = array(); + $fail = array(); + $warn = array(); + if ($GALLERY_REWRITE_OK) { + $success[] = _("mod_rewrite is enabled."); + } else { + $fail["fail-mod-rewrite"] = 1; + } + + return array($success, $fail, $warn); +} + +function check_exif($location = '') { + global $gallery; + + $fail = array(); + $success = array(); + $warn = array(); + + $bin = fs_executable('jhead'); + + if ($location) { + $dir = locateDir($bin, $location); + } else { + $dir = locateDir($bin, isset($gallery->app->use_exif) ? dirname($gallery->app->use_exif) : ""); + } + if (empty($dir)) { + $warn["fail-exif"] = _("Can't find jhead"); + } else { + $success[] = _("jhead binary located."); + } + + return array($success, $fail, $warn); +} + +function check_graphics($location = '', $graphtool = '') { + global $gallery; + + $fail = array(); + $success = array(); + $warn = array(); + + $missing_critical = array(); + $missing = 0; + $netpbm = array( + fs_executable("jpegtopnm"), + fs_executable("giftopnm"), + fs_executable("pngtopnm"), + fs_executable("pnmtojpeg"), + fs_executable("ppmtogif"), + fs_executable("pnmtopng"), + fs_executable("pnmscale"), + fs_executable("pnmfile"), + fs_executable("ppmquant"), + fs_executable("pnmcut"), + fs_executable("pnmrotate"), + fs_executable("pnmflip"), + fs_executable("pnmcomp"), + ); + + $fallback = array( + fs_executable("pnmtojpeg") => fs_executable("ppmtojpeg"), + fs_executable("pnmcomp") => fs_executable("pamcomp") + ); + + $optional = array( + fs_executable("pnmcomp") => + _("Without pnmcomp and pamcomp gallery will not be able to watermark images, unless you use ImageMagick and have the composite binary installed."), + ); + + $missing_optional = 0; + + /* Start checks */ + + if ($graphtool == 'ImageMagick') { + $success[] = _("NetPBM not being used in this installation."); + return array($success, $fail, $warn); + } + + if (!empty($location) && !inOpenBasedir($location)) { + $warn[] = _("Cannot verify this path (it's not in your open_basedir list)."); + return array($success, $fail, $warn); + } + + foreach ($netpbm as $bin) { + if (!empty($location)) { + $dir = locateDir($bin, $location, true); + } + elseif (isset($gallery->app->pnmDir)) { + $dir = locateDir($bin, $gallery->app->pnmDir, true); + } + else { + $dir = locateDir($bin); + } + + /* If we can't find the primary file, look for the fallback file instead. */ + if (empty($dir) && isset($fallback[$bin])) { + $newbin = $fallback[$bin]; + if (!empty($location)) { + $dir = locateDir($newbin, $location, true); + } + elseif (isset($gallery->app->pnmDir)) { + $dir = locateDir($newbin, $gallery->app->pnmDir, true); + } + else { + $dir = locateDir($newbin); + } + if (!empty($dir)) { + $bin = $newbin; + } + } + + if (empty($dir)) { + if (isset($optional[$bin])) { + $warn[$bin] = sprintf(_("Missing optional binary %s. %s"), $bin, $optional[$bin]); + } + else { + $missing_critical[$bin] = sprintf(_("Can't find %s!"), "$bin"); + } + $missing++; + } + + if (!empty($dir) && inOpenBasedir($dir)) { + if (!fs_is_executable("$dir/$bin")) { + $warn[$bin] = sprintf(_("%s is not executable!"), + "$bin "); + } + } + } + + if ($missing == count($netpbm)) { + $fail["fail-netpbm"] = 1; + /* Any other warning doesnt care */ + $warn = array(); + } + elseif ($missing > 0) { + $warn[] = sprintf(_("%d of %d NetPBM binaries located."), + count($netpbm) - $missing, count($netpbm)); + + if(count($missing_critical) > 0) { + $fail["fail-netpbm-partial"] = array_values($missing_critical); + } + } else { + $success[] = sprintf(_("%d of %d NetPBM binaries located."), + count($netpbm), count($netpbm)); + } + + return array($success, $fail, $warn); +} + +function check_graphics_im($location = '', $graphtool = '') { + global $gallery; + + $fail = array(); + $success = array(); + $warn = array(); + + $missing_critical = array(); + $missing = 0; + $imagick = array( + fs_executable("identify"), + fs_executable("convert"), + fs_executable("composite"), + ); + + $optional = array( + fs_executable("composite") => + _("Without composite gallery will not be able to watermark images, except you use NetPBM and have the pnmcomp binary installed."), + ); + + + /* Begin Checks */ + if ($graphtool == 'NetPBM') { + $success[] = _("ImageMagick not being used in this installation."); + return array($success, $fail, $warn); + } + + if (!empty($location) && !inOpenBasedir($location)) { + $success[] = _("Cannot verify this path (it's not in your open_basedir list)."); + return array($success, $fail); + } + + foreach ($imagick as $bin) { + if (!empty($location)) { + $dir = locateDir($bin, $location, true); + } + elseif (isset($gallery->app->ImPath)) { + $dir = locateDir($bin, $gallery->app->ImPath, true); + } + else { + $dir = locateDir($bin); + } + + if (empty($dir)) { + if (isset($optional[$bin])) { + $warn[$bin] = sprintf(_("Missing optional binary %s. %s"), $bin, $optional[$bin]); + } + else { + $missing_critical[$bin] = sprintf(_("Can't find %s!"), "$bin"); + } + $missing++; + } + + if (!empty($dir) && inOpenBasedir($dir)) { + if (!fs_is_executable("$dir/$bin")) { + $warn[$bin] = sprintf(_("%s is not executable!"), + "$bin "); + } + } + } + + if ($missing == count($imagick)) { + $fail["fail-imagemagick"] = 1; + /* Any other warning doesnt care */ + $warn = array(); + } + elseif ($missing > 0) { + $warn[] = sprintf(_("%d of %d ImageMagick binaries located."), + count($imagick) - $missing, count($imagick)); + + if(count($missing_critical) > 0) { + $fail["fail-imagemagick-partial"] = array_values($missing_critical); + } + } else { + $success[] = sprintf(_("%d of %d ImageMagick binaries located."), + count($imagick), count($imagick)); + } + + return array($success, $fail, $warn); +} + +function check_jpegtran($location = '') { + global $gallery; + + $fail = array(); + $success = array(); + $warn = array(); + + $bin = fs_executable("jpegtran"); + + if ($location) { + $dir = locateDir($bin, $location); + } else { + $dir = locateDir($bin, isset($gallery->app->use_jpegtran) ? dirname($gallery->app->use_jpegtran) : ""); + } + if (!$dir) { + $warn["fail-jpegtran"] = _("Can't find jpegtran!"); + } else { + $success[] = _("jpegtran binary located."); + } + + return array($success, $fail, $warn); +} + +function check_gettext() { + $fail = array(); + $success = array(); + $warn = array(); + if (gettext_installed()) { + $success[] = _("PHP has GNU gettext support."); + } else { + $warn["fail-gettext"] = _("PHP does not have GNU gettext support."); + } + return array($success, $fail, $warn); +} + +function check_gallery_languages() { + global $gallery; + $fail = array(); + $success = array(); + $warn = array(); + $nls = getNLS(); + + $languages=gallery_languages(); + if (sizeof($languages) == 0) { + $fail["fail-gallery-languages"] = _("No languages found."); // should never occur! + } else if (sizeof($languages) == 1 ) { + $warn['only_english'] = _("It seems you didn't download any additional languages. This is not a problem! Gallery will appear just in English. Note: If this is not true, check that all files in locale folder are readable for the webserver, or contact the Gallery Team."); + } + else { + $success[] = sprintf(_("%d languages are available. If you are missing a language please visit the %sGallery download page%s."), + sizeof($languages), + "url\">", + ''); + } + return array($success, $fail, $warn); +} + +function check_gallery_version() { + global $gallery; + $fail = array(); + $success = array(); + $warn = array(); + + /* how many days old is the gallery version? */ + $age = (time() - $gallery->last_change)/86400; + + /* is this a beta or RC version? */ + $beta = ereg('-(b|RC)[0-9]*$', $gallery->version); + + $link="url\">$gallery->url"; + + $visit=sprintf(_("You can check for more recent versions by visiting %s."), + $link); + $this_version = sprintf(_("This version of %s was released on %s."), + Gallery(), strftime("%x", $gallery->last_change)); + $this_beta_version = sprintf(_("This is a development build of %s that was released on %s."), + Gallery(), strftime("%x", $gallery->last_change)); + + if ($age > 180) { + $fail["too_old"] = "$this_version $visit"; + } else if ($age > 14 && $beta) { + $fail["too_old"] = "$this_beta_version $visit"; + } else if ($beta) { + $success["ok"] = "$this_beta_version $visit" . " " + . _("Please check regularly for updates."); + } else { + $success["ok"] = "$this_version $visit"; + } + return array($success, $fail, $warn); +} + +function check_absent_locales() { + global $locale_check; + $fail = array(); + $success = array(); + $warn = array(); + $msg = ''; + + $available = $locale_check["available_locales"]; + $maybe = $locale_check["maybe_locales"]; + $unavailable = $locale_check["unavailable_locales"]; + + if($locale_check != NULL && sizeof($unavailable) ==0) { + $success[] = _("All gallery locales are available on this host."); + } else if( (sizeof($maybe) + sizeof($unavailable)) > 0) { + if (sizeof($maybe) > 0) { + $msg = sprintf(_("There are %d locales that Gallery was unable to locate. You may need to select manually date formats. "),sizeof($maybe)); + } + + if (sizeof($unavailable) > 0) { + if(sizeof($maybe) > 0) $msg .= "

"; + + $msg .= sprintf(_("Dates in %d languages may not be formatted properly, because the corresponding locales are missing. You may need to select manually the date formats for these."),sizeof($unavailable)); + } + $warn[] = $msg; + } else { + if (ini_get('open_basedir') && getOS() != OS_LINUX) { + $warn[] = sprintf(_("We were unable to detect any locales. However, your PHP installation is configured with the %s restriction so this may be interfering with the way that we detect locales. Unfortunately this means the date format will not change for different languages. However, it is OK to continue."), + 'open_basedir'); + } else { + if (getOS() == OS_LINUX) { + $fail[] = sprintf(_("We were unable to detect any system locales. Multi-language functions will be disabled. Please install the corresponding locales or ask your administrator to do this. This problem is known on %s systems. In this case please have a look at this %sDebian locale HowTo%s."),"Debian", '', ""); + } else { + $warn[] = _("Only the default locale for this machine is available, so date format will not change for different languages."); + } + } + } + return array($success, $fail, $warn); +} + +function check_locale() { + $nls = getNLS(); + $gallery_languages = array_keys(gallery_languages()); + $system_locales = array(); + + $available_locales = array(); + $maybe_locales = array(); + $unavailable_locales = array(); + + /* Lets see which system locales are installed. */ + if (getOS() != OS_WINDOWS) { + # Unix / Linux + # Check which locales are installed + + exec("locale -a", $results, $status); + + if(count($results) >2) { + $system_locales = $results; + } elseif (@is_readable("/etc/locale.gen")) { + exec('grep -v -e "^#" /etc/locale.gen | cut -d " " -f 1', $system_locales); + } elseif (@is_readable("/usr/share/locale")) { + exec("ls /usr/share/locale", $system_locales); + } elseif (@is_readable("/usr/local/share/locale")) { + exec("ls /usr/local/share/locale", $system_locales); + } + } + + /* DAMN, there are none we use Linux and our PHP uses gettext*/ + if( sizeof($system_locales) == 0 && getOS() == OS_LINUX && gettext_installed()) { + return NULL; + } + + /* There were at least one system locale + ** Now lets test if our languages are supported by the system + */ + foreach ($gallery_languages as $locale) { + $aliases=array(); + + /* Found an supported one, put it in availables */ + if ( (in_array($locale, $system_locales)) || (setlocale(LC_ALL, $locale))) { + $available_locales[$locale]=$locale; + continue; + } + + /* + ** First, we try using the full lang, (first 5 chars) if + ** that doesn't match then + ** we use the first 2 letter to build an alias list + ** e.g. nl to find nl_BE or nl_NL + */ + if (in_array($locale,$nls['alias'])) { + $keylist = array_keys($nls['alias'],$locale); + $aliases = $keylist; + if (getOS() != OS_WINDOWS) { + $sub='^(' . implode('|', $keylist) . '|' . substr($locale,0,5) . ')'; + foreach ($system_locales as $key => $value) { + if (ereg($sub, $value)) { + $aliases[] = $value; + } + elseif (ereg('^' . substr($locale,0,2),$value)) { + $aliases[] = $value; + } + } + } + } else { + foreach ($system_locales as $key => $value) { + if (ereg('^' . substr($locale,0,2), $value)) { + $aliases[] = $value; + } + } + } + + $aliases=array_unique($aliases); + $noway=Array ('zh_TW.eucTW'); + if ($aliases) { + foreach ($aliases as $test) { + // We do this because all locales in $noway seem to crash at least some NetBSD + // Maybe changed in future + if (!in_array($test,$noway)) { + if (setlocale(LC_ALL,$test)) { + $maybe_locales[$locale][]=$test; + } + } + } + if (! isset($maybe_locales[$locale])) { + $unavailable_locales[] = $locale; + } + } else { + $unavailable_locales[]=$locale; + } + } + + + // Set locale correct back + if (isset($gallery->locale)) { + setlocale(LC_ALL,$gallery->locale); + } else { + setlocale(LC_ALL,""); + } + + /* DAMN, there are no suitable locales, we use Linux and our PHP uses gettext*/ + if( sizeof($available_locales) == 0 && sizeof($maybe_locales) == 0 && getOS() == OS_LINUX && gettext_installed()) { + return NULL; + } + + return array( + "available_locales" => $available_locales, + "maybe_locales" => $maybe_locales, + "unavailable_locales" => $unavailable_locales + ); +} + + +function config_maybe_locales() { + global $locale_check, $locales; + + $results = array(); + $locales = $locale_check; + $available = $locales["available_locales"]; + $maybe = $locales["maybe_locales"]; + $unavailable = $locales["unavailable_locales"]; + + // If we are in Linux, our PHP has gettext, + // but we could not find any locale we skip the whole aliasing part. + if($locales == NULL) return $results; // blank array + + $nls = getNLS(); + + $block_start_done = false; + + $nr=0; + foreach ($maybe as $key => $aliases) { + if (sizeof($aliases) < 1) { + $unavailable[]=$key; + continue; + } +/* + if (sizeof($aliases) == 1) { + $results["locale_alias['$key']"] = array ( + "type" => "hidden", + "value" => array_pop($aliases), + "desc" => "locale_alias[$key]", + "prompt" => "locale_alias[$key]" + ); + continue; + } +*/ + $nr++; + if (!$block_start_done) { + $block_start_done=true; + $results[] = array ( + "type" => "block_start", + "prompt" => "(" . _("Advanced") . ")
".sprintf(_("System locale selection required")), + "desc" => _("There is more than one suitable system locale installed on your machine for the following languages. Please chose the one you think is most suitable.") . + "

" . + _("This is only for date & time format. You only need to edit the languages you enabled above") + ); + } + $index = $nls['language'][$key] ; + + $choices=array(); + + foreach ($aliases as $value) { + $choices[$value]=$value; + } + if (getOS() != OS_WINDOWS) { + $choices[""] = _("System locale"); + next($choices); + } + $results["locale_alias['$key']"] = array ( + "prompt" => $nr .".) ". $nls['language'][$key], + "optional" => 1, + "name" => "locale_alias", + "key" => $key, + "type" => "block_element", + "choices" => $choices, + "value" => (getOS() != OS_WINDOWS) ? key($choices) : "", + "allow_empty" => true, + "remove_empty" => true + ); + + + } + + if ($block_start_done) { + $results[] = array ("type" => "block_end"); + } + $block_start_done=false; + + $choices=array(); + if (getOS() != OS_WINDOWS) $choices=array("" => _("System locale")); + if (sizeof($available) > 0) { + foreach ($available as $choice => $value) { + $choices[$choice]=$nls['language'][$value]; + } + + $avail_keys=array_keys($available); + } elseif (sizeof($maybe) > 0) { + foreach ($maybe as $key => $aliases) { + foreach ($aliases as $choice) { + $choices[$choice]=$choice; + } + } + + $avail_keys=array_keys($choices); + } else { + if (getOS() == OS_OTHER) { + $array_keys=$choices; + } else { + $skip=true; + } + } + + if (! isset ($skip)) { + $avail_keys=array_keys($choices); + foreach ($unavailable as $key) { + if (sizeof($choices) == 1) { + $results["locale_alias['$key']"] = array ( + "type" => "hidden", + "value" => $avail_keys[0], + "desc" => "locale_alias[$key]", + "prompt" => "locale_alias[$key]", + "allow_empty" => true, + "remove_empty" => true + ); + continue; + } + + if (!$block_start_done) { + $block_start_done=true; + $results[] = array ( + "type" => "block_start", + "prompt" => "(" . _("Advanced") . ")
".sprintf(_("System locale problems")), + "desc" => _("There are no apparently suitable system locales installed on your machine for the following languages. Please choose the one you think is most suitable.") . + "

" . + _("This is only for date & time format. You only need to edit the languages you enabled above") + ); + } + $index = $nls['language'][$key] ; + $results["locale_alias['$key']"] = array ( + "prompt" => $nls['language'][$key], + "name" => "locale_alias", + "key" => $key, + "type" => "block_element", + "choices" => $choices, + "value" => "", + "allow_empty" => true, + "remove_empty" => true + ); + } + if ($block_start_done) { + $results[] = array ("type" => "block_end"); + } + } + return $results; +} + +function default_graphics() { + list ($imageMagick,) = check_graphics_im(); + + if (count ($imageMagick)) { + return "ImageMagick"; + } else { + return "NetPBM"; + } +} + +function check_safe_mode() { + $fail = array(); + $success = array(); + $warn = array(); + $safe_mode = ini_get("safe_mode"); + if (empty($safe_mode) || + !strcasecmp($safe_mode, "off") || + !strcasecmp($safe_mode, "0") || + !strcasecmp($safe_mode, "false")) { + $success[] = _("safe_mode is off."); + } else { + $fail["fail-safe-mode"] = 1; + } + return array($success, $fail,$warn); +} + +function check_magic_quotes() { + $fail = array(); + $success = array(); + $warn = array(); + if (!get_magic_quotes_gpc()) { + $success[] = _("magic_quotes are off."); + } else { + $fail["fail-magic-quotes"] = 1; + } + + return array($success, $fail, $warn); +} + +function check_poll_nv_pairs($var) { + $fail = array(); + $success = array(); + $finished = false; + $rownum=0; + foreach ($var as $element) { + $rownum++; + if (!$element["name"]) { + $finished=true; + if ($element["value"]) { + $fail[]=sprintf(_("In %s, missing %s in row %d with %s %s."), + _("Vote words and values"), + _("Name"), $rownum, _("Value"), + $element["value"]); + break; + } + continue; + } else { + if ($finished) { + $fail[]=sprintf(_("In %s, blank in row %d."), + _("Vote words and values"), + $rownum-1); + break; + } else if (!ereg("^[1-9][0-9]*$", $element["value"])) { + $fail[]=sprintf(_("In %s, for name %s (row %d) value %s should be a positive whole number"), + _("Vote words and values"), + $element["name"], + $rownum, $element["value"]); + break; + } + } + } + return array($success, $fail); +} + +function check_register_globals() { + $fail = array(); + $success = array(); + $warn = array(); + + $globals_enabled = ini_get('register_globals'); + + if (!empty($globals_enabled) && !eregi('no|off|false', $globals_enabled)) { + $fail['warn-register_globals'] = 1; + } + else { + $success[] = _("register_globals is off."); + } + + return array($success, $fail, $warn); +} + +function detect_exec_status() { + global $gallery; + + if (isset($gallery->app) && isset($gallery->app->expectedExecStatus)) { + return $gallery->app->expectedExecStatus; + } + + // If PHP is compiled with the --enable-sigchild option, then every + // exec() call returns an error status of -1. WTF?!?! Sigh. So + // Let's do some checking on some pretty standard programs and see + // what they return. + $progs = array( + "ls", + "echo", + "hostname", + "pwd", + "df", + "ps", + "sync", + ); + + $count = array(); + foreach ($progs as $prog) { + $dir = locateDir($prog); + if ($dir) { + $file = "$dir/$prog"; + if (fs_is_executable($file)) { + fs_exec($file, $results, $status); + if (isset($count[$status])) { + $count[$status]++; + } else { + $count[$status]=1; + } + } + } + } + + if (count($count) == 0) { + // Nothing! :-( Hope for the best. + return 0; + } else { + // Return the one that we see the most of. + $max = -1; + foreach ($count as $key => $val) { + if ($val > $max) { + $status = $key; + $max = $val; + } + } + } + + return $status; +} + +/* + * Actually try to write to a file inside the directory. This detects + * open_basedir restrictions. + */ +function test_write_to_dir($dir) { + $tmpfile = tempnam($dir, "dbg"); + if ($fd = fs_fopen($tmpfile, "w")) { + fclose($fd); + unlink($tmpfile); + return 1; + } + + return 0; +} + +function inOpenBasedir($dir) { + $openBasedir = ini_get('open_basedir'); + if (empty($openBasedir)) { + return true; + } + + /* + * XXX: this is not perfect. For example, if the open_basedir list + * contains "/usr/localx" this code will match "/usr/local". Let's not + * worry too much about that now. + */ + foreach (explode(':', $openBasedir) as $basedir) { + if (!strncmp($basedir, $dir, strlen($basedir))) { + return true; + } + } + + return false; +} + +function make_separator($key, $arr) { + $buf ="\n
"; + $buf .= "\n\t
". $arr["title"] ."
"; + if( isset($arr["desc"])) { + $buf .= "\n
". $arr["desc"] ."
"; + } + $buf .="\n
"; + + return $buf; +} + +function array_stripslashes($subject) { + if (is_string($subject)) { + return stripslashes($subject); + } + if (!is_array($subject)) { + return ($subject); + } + $ret=array(); + foreach ($subject as $key => $value) { + $ret[$key]=array_stripslashes($value); + } + return $ret; +} + +/* +** Check if Magic Quotes are On +** If yes stripslashes and return the cleaned input. +** +** Jens Tkotz, 02/2004 +*/ +function stripWQuotesON($mixed) { + if (get_magic_quotes_gpc()) { + return array_stripslashes($mixed); + } + else { + return $mixed; + } + +} + +function array_urldecode($subject) { + if (is_string($subject)) { + return urldecode($subject); + } + if (!is_array($subject)) { + return ($subject); + } + $ret=array(); + foreach ($subject as $key => $value) { + $ret[$key]=array_urldecode($value); + } + return $ret; +} + +function array_str_replace($search, $replace, $subject) { + if (is_string($subject)) { + return str_replace($search, $replace, $subject); + } + if (!is_array($subject)) { + return ($subject); + } + $ret=array(); + foreach ($subject as $key => $value) { + $ret[$key]=array_str_replace($search, $replace, $value); + } + return $ret; +} + +function verify_password($passwords) { + $success = array(); + $fail = array(); + if ($passwords[2] === $passwords[3]) { + $success[] = true; + } else { + $fail[] = _('Your passwords do not match!'); + } + return array($success, $fail); +} + +function verify_email($emailMaster) { + global $gallery; + + $fail = array(); + $success = array(); + if ($emailMaster == "no") { + $success[] = _("OK"); + return array($success, $fail); + } + + if (check_email($gallery->session->configForm->adminEmail)) { + $success[] = _("Valid admin email address given."); + } else { + $adminEmail = ereg_replace('([[:space:]]+)', '', $gallery->session->configForm->adminEmail); + $emails = array_filter1(explode(',', $gallery->session->configForm->adminEmail)); + $size = sizeof($emails); + + if ($size < 1) { + $fail[]= _("You must specify valid admin email addresses"); + } else { + $adminEmail=""; + $join=""; + foreach ($emails as $email) { + $adminEmail .= "$join$email"; + $join=","; + if (! check_email($email)) { + $fail[] = sprintf(_("%s is not a valid email address."), + $email); + } else { + $success[] = "Valid admin email given."; + } + } + } + } + if (check_email($gallery->session->configForm->senderEmail)) { + $success[] = _("Valid sender email address given."); + } else { + $fail[]= _("You must specify a valid sender email address"); + } + if (!empty($gallery->session->configForm->emailGreeting) && !strstr($gallery->session->configForm->emailGreeting, "!!USERNAME!!")) { + $fail[]= sprintf(_("You must include %s in your welcome email"), "!!USERNAME!!"); + } + if (!empty($emailGreeting) && + !strstr($gallery->session->configForm->emailGreeting, "!!PASSWORD!!" ) && + !strstr($gallery->session->configForm->emailGreeting, "!!NEWPASSWORDLINK!!" )) { + $fail[]= sprintf(_("You must include %s or %s in your welcome email"), + "!!PASSWORD!!", + "!!NEWPASSWORDLINK!!"); + } + return array($success, $fail); +} + +function check_ecards($num) { + if ($num < 15 || $num > 365) { + $fail = array(); + $fail["fail-ecardPrune"]++; + } else { + $success = array(); + $success[] = "Valid value specified."; + } + return array($success, $fail); +} + +function check_gallery_versions() { + $fail = array(); + $success = array(); + $warn = array(); + list($oks, $errors, $warnings) = checkVersions(false); + if ($errors) { + $fail[]=sprintf(_("The following files are out of date, corrupted or missing:
    %s."), + implode('
    ', array_keys($errors))). "

" . + "
" . _("This should be fixed before proceeding") . + "
" . sprintf(_("Look at %sCheck Versions%s for more details."), + "", ""); + } else if ($warnings) { + $warn[]=sprintf(_("%d files are more recent than expected. This is OK if you are using pre-release, beta, CVS or modified code."), count($warnings)) . + "
" . sprintf(_("Look at %sCheck Versions%s for more details."), + "", ""); + } else { + if (count($oks) == 0) { + $success[] = sprintf(_("All tested files up-to-date.")); + } else { + $success[]=sprintf(_("All %d tested files up-to-date."), count($oks)); + } + } + return array($success, $fail, $warn); +} + + +function newIn($version) { + $buf = "\n\t
("; + $buf .= sprintf(_("this is new in version %s"), $version); + $buf .= ")"; + return $buf; +} +function returnToConfig() { + $buf = sprintf(_("Return to %s."), '' . + _("Configuration Wizard") . ''); + return $buf; +} +if (!function_exists('array_filter1')) { + function array_filter1($input, $function=NULL) { + $output=array(); + foreach ($input as $name => $value) { + if ($function && $function($value)) { + $output[$name]=$value; + } else if ($value) { + $output[$name]=$value; + } + } + return $output; + } +} + +function check_admins() { + + global $gallery; + + $admins=array(); + + if (isset($gallery->app->userDir) && fs_is_dir($gallery->app->userDir)) { + require_once(GALLERY_BASE . '/classes/User.php'); + require_once(GALLERY_BASE . '/classes/EverybodyUser.php'); + require_once(GALLERY_BASE . '/classes/NobodyUser.php'); + require_once(GALLERY_BASE . '/classes/LoggedInUser.php'); + require_once(GALLERY_BASE . '/classes/UserDB.php'); + require_once(GALLERY_BASE . '/classes/gallery/UserDB.php'); + require_once(GALLERY_BASE . '/classes/gallery/User.php'); + + + $userDB = new Gallery_UserDB(); + + $admins=array(); + if (isset($userDB)) { + foreach ($userDB->getUidList() as $uid) { + $tmpUser = $userDB->getUserByUid($uid, true); + + if ($tmpUser->isAdmin()) { + $admins[]=$tmpUser->getUsername(); + } + } + } + } + + if (empty($admins)) { + $result=array( + 'desc' => sprintf(_('You must enter a password for the %s account.'), 'admin') + ); + } + else if (! in_array("admin",$admins)) { + if (sizeof($admins) == 1) { + $desc_text=sprintf(_("It seems you've already configured Gallery, because there is one admin account, but its not called %s."), 'admin'); + } + else { + $desc_text=sprintf(_("It seems you've already configured Gallery, because there are %d admin accounts, but no user called %s."), sizeof($admins), 'admin'); + } + $desc_text .= " " . sprintf (_("You don't have to enter a password. But if you do, Gallery will create an administrator account called %s with that password."), 'admin'); + $result=array( + "desc" => $desc_text, + "optional" => 1, + "remove_empty" => true + ); + } + else { + $result=array( + "desc" => sprintf(_("It seems you've already configured Gallery, because the %s user exists. You don't have to enter a password. But if you do, Gallery will change the password for the %s user."), 'admin', 'admin'), + "optional" => 1, + "remove_empty" => true + ); + } + + $result = array_merge($result,array( + "prompt" => _("Admin password"), + "type" => "password", + "dont-write" => 1, + 'verify-func' => 'verify_password', + "value" => "", + "attrs" => array("size" => 20), + "required" => true, + )); + + return $result; +} + +function displayNameOptions() { + return array ( + "!!FULLNAME!! (!!USERNAME!!)" => + sprintf("%s (%s)", _("Full Name"), _("Username")), + "!!USERNAME!! (!!FULLNAME!!)" => + sprintf("%s (%s)", _("Username"), _("Full Name")), + "!!FULLNAME!!" => + _("Full Name"), + "!!USERNAME!!" => + _("Username"), + "!!MAILTO_FULLNAME!!" => + _("Full name that you can click on to send email (mailto:)"), + "!!MAILTO_USERNAME!!" => + _("Username that you can click on to send email (mailto:)"), + "!!FULLNAME!! (!!EMAIL!!)" => + sprintf("%s (%s)", _("Full Name"), _("email address")), + "!!USERNAME!! (!!EMAIL!!)" => + sprintf("%s (%s)", _("Username"), _("email address")), + ); +} + +function check_filedirective() { + $success = array(); + $fail = array(); + $warn = array(); + + if (strstr(__FILE__, 'lib/setup.php') || + strstr(__FILE__, 'lib\\setup.php')) { + $success[]=_("Your version of PHP handles this issue properly."); + } else { + $fail['buggy__FILE__'] = 1; + } + + return array($success, $fail, $warn); +} + +function checkVersions($verbose=false) { + global $gallery; + /* we assume setup/init.php was loaded ! */ + + $manifest=GALLERY_BASE . '/manifest.inc'; + $success=array(); + $fail=array(); + $warn=array(); + if (!fs_file_exists($manifest)) { + $fail["manifest.inc"]=_("File missing or unreadable. Please install then re-run this test."); + return array($success, $fail, $warn); + } + if (!function_exists('getCVSVersion')) { + $fail['util.php']=sprintf(_("Please ensure that %s is the latest version."), "util.php"); + return array($success, $fail, $warn); + } + include (GALLERY_BASE . '/manifest.inc'); + if ($verbose) { + print sprintf(_("Testing status of %d files."), count($versions)); + } + foreach ($versions as $file => $version) { + $found_version=getCVSVersion($file); + if ($found_version === NULL) { + if ($verbose) { + print "
\n"; + print sprintf(_("Cannot read file %s."), $file); + } + $fail[$file]=_("File missing or unreadable."); + continue; + } else if ($found_version === "") { + if ($verbose) { + print "
\n"; + print sprintf(_("Version information not found in %s. File must be old version or corrupted."), $file); + } + $fail[$file]=_("Missing version"); + continue; + } + $compare=compareVersions($version, $found_version); + if ($compare < 0) { + if ($verbose) { + print "
\n"; + print sprintf(_("Problem with %s. Expected version %s (or greater) but found %s."), $file, $version, $found_version); + } + $fail[$file]=sprintf(_("Expected version %s (or greater) but found %s."), $version, $found_version); + } else if ($compare > 0) { + if ($verbose) { + print "
\n"; + print sprintf(_("%s OK. Actual version (%s) more recent than expected version (%s)"), $file, $found_version, $version); + } + $warn[$file]=sprintf(_("Expected version %s but found %s."), $version, $found_version); + } else { + if ($verbose) { + print "
\n"; + print sprintf(_("%s OK"), $file); + } + $success[$file]=sprintf(_("Found expected version %s."), $version); + } + + } + return array($success, $fail, $warn); +} + +/** + * This function creates a table with tabs for navigating through Config Sections (Groups). + * + * It analyses a given Array which is in config_data Style: + * + * "" => array ( + * "type" => + * "name" => + * "default" => + * "title" => + * "desc" => + * ) + * + * "type" : Indicates that a group starts or ends. Possible values: 'group_start' , 'group_end'. + * "name" : To identify the group you have to set a name. + * "default" : Indicates wether the group is visible or not. Possible values: 'inlineÄ', 'none'. + * "title" : When the group is visible, this title is displayed in the header line. + * "desc" : This optional Description is displayed under the title. + * ""contains_required" : Indicates that this Group contains field that are required + * + * Note: - The first group which default is 'inline' will the group that is selected when opening the Page. + * - You always need a group_end for a group. Otherwise everything below will belong to the group. + * + * @author Jens Tkotz + */ + +function makeSectionTabs($array, $break = 7, $initialtab = '') { + $tabs = array(); + + foreach ($array as $key => $var) { + if(isset($var['type']) && $var['type'] == 'group_start') { + $tab[]=$var; + } + } + + echo "\n"; + echo "\n"; + $tabcount = 0; + foreach ($tab as $cell) { + $tabcount++; + if (($cell['default'] == 'inline' && !$initialtab) || $initialtab == $cell['name']) { + $class = 'class="tab-hi"'; + if (empty($initialtab)) { + $initialtab = $cell['name']; + } + } + else { + $class = 'class="tab"'; + } + echo "\n\t'; + echo "\n\t"; + if ($tabcount % $break == 0) { + echo "\n\n
"; + echo $cell['title']; + if (!empty($cell['contains_required'])) { + echo '*'; + } + echo ' 
"; + echo "\n\n"; + } + } + echo "\n"; + echo "\n
\n"; + + echo "\n". ''; + echo "\n". '\n"; +} + +function configLogin($target) { + global $gallery; + + if (fs_file_exists(GALLERY_SETUPDIR . "/resetadmin")) { + $resetFile = getFile(GALLERY_SETUPDIR . "/resetadmin"); + $resetFile = trim($resetFile); + } + else { + // If the file is not present (perhaps removed after visiting the config page) + // unset the Guid so we don't keep asking for something that's not there. + $gallery->session->resetAdminGuid = null; + } + + // The gallery has never been configured, or the admin password has been lost and needs to be reset - ignore login requirement + // If the user has already logged in, and is viewing one of the setup pages, they will be logged in automatically by the form + if (!isset($gallery->app->userDir) || (isset($gallery->session->resetAdminGuid) && $gallery->session->resetAdminGuid == $resetFile)) { + return; + } + else { + // Load userDB for password validation - this is a re-configuration + require_once(GALLERY_BASE . '/classes/User.php'); + require_once(GALLERY_BASE . '/classes/EverybodyUser.php'); + require_once(GALLERY_BASE . '/classes/NobodyUser.php'); + require_once(GALLERY_BASE . '/classes/LoggedInUser.php'); + require_once(GALLERY_BASE . '/classes/UserDB.php'); + require_once(GALLERY_BASE . '/classes/gallery/UserDB.php'); + require_once(GALLERY_BASE . '/classes/gallery/User.php'); + $gallery->userDB = new Gallery_UserDB(); + + // Check the UserDB for upgrades before trying to make someone login + if ($gallery->userDB->versionOutOfDate()) { + include(GALLERY_BASE . "/upgrade_users.php"); + exit; + } + + include(GALLERY_BASE . '/setup/login.inc'); + } +} + +function placeholderDescription() { + $placeholderDescription = + _("This email will be sent when new accounts are created.") . + _("Leaving this field empty sets Gallery to use the default message (see below) which can be translated, or use your own welcome message.") . + _("The following placeholder can be used:") . + '

'; + + foreach(welcomeMsgPlaceholderList() as $placeholder => $description) { + $placeholderDescription .= ''. + ''. + "". + ''; + } + $placeholderDescription .= '
!!'. strtoupper($placeholder) . '!!$description

'. + + '
'. + nl2br(welcome_email(true)) . + '
'; + + return $placeholderDescription; +} +?> diff -Naur gallery-1.5-pl1/lib/url.php gallery-1.5.1/lib/url.php --- gallery-1.5-pl1/lib/url.php 2005-03-07 02:59:58.000000000 +0100 +++ gallery-1.5.1/lib/url.php 2005-09-21 22:35:24.000000000 +0200 @@ -1,26 +1,77 @@ app) && isset($gallery->app->photoAlbumURL)) { + $base = $gallery->app->photoAlbumURL; + } + elseif(where_i_am() == 'config') { + $base = '..'; + } elseif (defined('GALLERY_URL')) { + $base = GALLERY_URL; + } else { + $base = '.'; + } + + return $base; +} +/** * Any URL that you want to use can either be accessed directly * in the case of a standalone Gallery, or indirectly if we're * mbedded in another app such as Nuke. makeGalleryUrl() will * always create the appropriate URL for you. * - * Usage: makeGalleryUrl(target, args [optional]) + * @param string $target File with a relative path to the gallery base + * (eg, "album_permissions.php") * - * target is a file with a relative path to the gallery base - * (eg, "album_permissions.php") - * - * args are extra key/value pairs used to send data - * (eg, array("index" => 1, "set_albumName" => "foo")) + * @param array $args Optional array containg additional Urlargs. + * (eg, array("index" => 1, "set_albumName" => "foo")) + * @return string */ -function makeGalleryUrl($target, $args=array()) { - +function makeGalleryUrl($target = '', $args = array()) { global $gallery; global $GALLERY_EMBEDDED_INSIDE; global $GALLERY_EMBEDDED_INSIDE_TYPE; global $GALLERY_MODULENAME; + global $modpath; + + if (empty($GALLERY_MODULENAME) + && $GALLERY_EMBEDDED_INSIDE =='nuke' + && !empty($modpath)) { + $GALLERY_MODULENAME = basename(dirname($modpath)); + } /* Needed for phpBB2 */ global $userdata; @@ -32,7 +83,25 @@ /* Needed for CPGNuke */ global $mainindex; - if( isset($GALLERY_EMBEDDED_INSIDE)) { + $url = ''; + $prefix = ''; + $isSetupUrl = (stristr($target,"setup")) ? true : false; + + if(!urlIsRelative($gallery->app->photoAlbumURL)) { + $gUrl = parse_url($gallery->app->photoAlbumURL); + $urlprefix = $gUrl['scheme'] .'://'. $gUrl['host']; + } + else { + $urlprefix = ''; + } + + /* make sure the urlprefix doesnt end with a / */ + $urlprefix = ereg_replace("\/$", "", $urlprefix); + + /* Add the folder to the url when *Nuke is not direct in the main folder */ + $addpath = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')); + + if( isset($GALLERY_EMBEDDED_INSIDE) && !$isSetupUrl && where_i_am() != 'config') { switch ($GALLERY_EMBEDDED_INSIDE_TYPE) { case 'phpBB2': $cookiename = $board_config['cookie_name']; @@ -46,9 +115,20 @@ } case 'phpnuke': - case 'postnuke': case 'nsnnuke': $args["op"] = "modload"; + $args["name"] = $GALLERY_MODULENAME; + $args["file"] = "index"; + + /* + * include *must* be last so that the JavaScript code in + * view_album.php can append a filename to the resulting URL. + */ + $args["include"] = $target; + $url = $urlprefix . $addpath .'/modules.php'; + break; + + case 'cpgnuke': $args["name"] = "$GALLERY_MODULENAME"; $args["file"] = "index"; @@ -57,9 +137,28 @@ * view_album.php can append a filename to the resulting URL. */ $args["include"] = $target; - $target = "modules.php"; + $url = $urlprefix . $addpath . "/$mainindex"; break; + case 'postnuke': + if (substr(_PN_VERSION_NUM, 0, 7) < "0.7.6.0") { + $args["op"] = "modload"; + $args["file"] = "index"; + + $url = $urlprefix . $addpath . '/modules.php'; + } + else { + $url = $urlprefix . pnGetBaseURI()."/index.php"; + } + + $args["name"] = $GALLERY_MODULENAME; + /* + * include *must* be last so that the JavaScript code in + * view_album.php can append a filename to the resulting URL. + */ + $args["include"] = $target; + break; + case 'mambo': $args['option'] = $GALLERY_MODULENAME; $args['Itemid'] = $MOS_GALLERY_PARAMS['itemid']; @@ -71,39 +170,28 @@ */ if ((isset($args['type']) && $args['type'] == 'popup') || (!empty($args['gallery_popup']))) { - $target= $gallery->app->photoAlbumURL . "/index.php"; + $target = 'index.php'; } else { if (!empty($gallery->session->mambo->mosRoot)) { - $target = $gallery->session->mambo->mosRoot . "index.php"; + $url = $urlprefix . $gallery->session->mambo->mosRoot . 'index.php'; } else { - $target = 'index.php'; + $url ='index.php'; } } break; - case 'cpgnuke': - $args["name"] = "$GALLERY_MODULENAME"; - $args["file"] = "index"; - /* - * include *must* be last so that the JavaScript code in - * view_album.php can append a filename to the resulting URL. - */ - $args["include"] = $target; - $target = $mainindex; - break; - // Maybe something went wrong, then we assume we are like standalone. + // Maybe something went wrong, we do nothing as URL we be build later. default: - $target = $gallery->app->photoAlbumURL . "/" . $target; + break; } } - else { - $prefix = isset($gallery->app->photoAlbumURL) ? $gallery->app->photoAlbumURL . "/" : ""; - $target = $prefix . $target; + + if (empty($url)) { + $url = getGalleryBaseUrl() ."/$target"; } - - $url = $target; + if ($args) { $i = 0; foreach ($args as $key => $value) { @@ -186,4 +274,47 @@ } } +/** + * @param string $name Name of Image + * @param string $skinname Optional Name skin, if file is not found, fallback to default location + * @return string $retUrl Complete URL to the Image + */ +function getImagePath($name, $skinname = '') { + global $gallery; + $retUrl = ''; + + if (!$skinname) { + $skinname = $gallery->app->skinname; + } + + /* We cant use makeGalleryUrl() here, as Gallery could be embedded. */ + $base = getGalleryBaseUrl(); + $defaultname = "$base/images/$name"; + $fullname = dirname(dirname(__FILE__)) . "/skins/$skinname/images/$name"; + $fullURL = "$base/skins/$skinname/images/$name"; + + if (fs_file_exists($fullname) && !broken_link($fullname)) { + $retUrl = $fullURL; + } else { + $retUrl = $defaultname; + } + + return $retUrl; +} + +/** + * Checkes wether an URL is relative or not + * @param string $url + * @return boolean + * @author Jens Tkotz + */ +function urlIsrelative($url) { + if (substr($url, 0,4) == 'http') { + return false; + } + else { + return true; + } +} + ?> diff -Naur gallery-1.5-pl1/lib/valchecks.php gallery-1.5.1/lib/valchecks.php --- gallery-1.5-pl1/lib/valchecks.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.1/lib/valchecks.php 2005-09-13 00:40:47.000000000 +0200 @@ -0,0 +1,84 @@ + + diff -Naur gallery-1.5-pl1/lib/voting.php gallery-1.5.1/lib/voting.php --- gallery-1.5-pl1/lib/voting.php 2005-03-10 03:30:08.000000000 +0100 +++ gallery-1.5.1/lib/voting.php 2005-09-13 00:40:47.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: voting.php,v 1.4.4.1 2005/03/10 02:30:08 cryptographite Exp $ + * $Id: voting.php,v 1.7.2.1 2005/09/12 22:40:47 dmolavi Exp $ */ ?> album must be set +*/ + +function buildVotingInputFields() { + global $gallery; + + $nv_pairs = $gallery->album->getVoteNVPairs(); + $votingInputFieldArray = array(); + for ($i=0; $i<$gallery->album->getPollScale() ; $i++) { + $votingInputFieldArray[] = ""; + $votingInputFieldArray[] = ""; + } + + return $votingInputFieldArray; +} + ?> diff -Naur gallery-1.5-pl1/LICENSE.txt gallery-1.5.1/LICENSE.txt --- gallery-1.5-pl1/LICENSE.txt 2003-06-26 11:23:53.000000000 +0200 +++ gallery-1.5.1/LICENSE.txt 2005-09-13 00:40:44.000000000 +0200 @@ -1,11 +1,11 @@ -$Id: LICENSE.txt,v 1.2 2003/06/26 09:23:53 jefmcg Exp $ +$Id: LICENSE.txt,v 1.2.24.1 2005/09/12 22:40:44 dmolavi Exp $ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies +51 Franklin Street - Fifth Floor, Boston, MA 02110-1301 USA +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble @@ -307,7 +307,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. diff -Naur gallery-1.5-pl1/login.php gallery-1.5.1/login.php --- gallery-1.5-pl1/login.php 2005-03-10 17:52:40.000000000 +0100 +++ gallery-1.5.1/login.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: login.php,v 1.61.2.4 2005/03/10 16:52:40 cryptographite Exp $ + * $Id: login.php,v 1.65.2.2 2005/09/12 22:40:44 dmolavi Exp $ */ ?> "login_form", "method" => "POST")); ?> -

+ @@ -91,11 +91,9 @@
-

-

+

"> " onclick='parent.close()'> -

@@ -108,53 +106,53 @@ echo makeFormIntro("login.php", array("name" => "forgot_form", "method" => "POST")); if (!empty($forgot)) { - $tmpUser = $gallery->userDB->getUserByUsername($username); - if ($tmpUser) { - $wait_time=15; - if ($tmpUser->lastAction == "new_password_request" && - time() - $tmpUser->lastActionDate < $wait_time * 60) { - echo gallery_error(sprintf(_("The last request for a password was less than %d minutes ago. Please check for previous email, or wait before trying again."), $wait_time)); - - } else if (gallery_validate_email($tmpUser->getEmail())) { - if (gallery_mail( $tmpUser->email, - _("New password request"), - sprintf(_("Someone requested a new password for user %s from Gallery '%s' on %s. You can create a password by visiting the link below. If you didn't request a password, please ignore this mail. "), $username, $gallery->app->galleryTitle, $gallery->app->photoAlbumURL) . "\n\n" . - sprintf(_("Click to reset your password: %s"), - $tmpUser->genRecoverPasswordHash()) . "\n", - sprintf(_("New password request %s"), $username))) { - $tmpUser->log("new_password_request"); - $tmpUser->save(); + $tmpUser = $gallery->userDB->getUserByUsername($username); + if ($tmpUser) { + $wait_time=15; + if ($tmpUser->lastAction == "new_password_request" && + time() - $tmpUser->lastActionDate < $wait_time * 60) { + echo gallery_error(sprintf(_("The last request for a password was less than %d minutes ago. Please check for previous email, or wait before trying again."), $wait_time)); + + } else if (check_email($tmpUser->getEmail())) { + if (gallery_mail( $tmpUser->email, + _("New password request"), + sprintf(_("Someone requested a new password for user %s from Gallery '%s' on %s. You can create a password by visiting the link below. If you didn't request a password, please ignore this mail. "), $username, $gallery->app->galleryTitle, $gallery->app->photoAlbumURL) . "\n\n" . + sprintf(_("Click to reset your password: %s"), + $tmpUser->genRecoverPasswordHash()) . "\n", + sprintf(_("New password request %s"), $username))) { + $tmpUser->log("new_password_request"); + $tmpUser->save(); echo sprintf(_("An email has been sent to the address stored for %s. Follow the instructions to change your password. If you do not receive this email, please contact the Gallery administrators."),$username) ?>

" onclick='parent.close()'>
app->galleryTitle )); - } - return; - } else { - echo gallery_error(sprintf(_("There is no valid email for this account. Please contact %s administrators for a new password"),$gallery->app->galleryTitle )); - } - } else { - echo gallery_error(_("Not a valid username")); - } - } + } + else { + echo gallery_error(sprintf(_("Email could not be sent. Please contact %s administrators for a new password"),$gallery->app->galleryTitle )); + } + return; + } + else { + echo gallery_error(sprintf(_("There is no valid email for this account. Please contact %s administrators for a new password"),$gallery->app->galleryTitle )); + } + } + else { + echo gallery_error(_("Not a valid username")); + } + } ?> -

-

-

-

">
+

">

- + + + + +
album->fields["title"]) ?>
+
+setCaption(_("Meaning of the borderstyle")); +$explainTable->setAttrs(array('width' => 300, 'cellspacing' => 3, 'cellpadding' => 2)); +$explainTable->setColumnCount(4); + +$explainTable->addElement(array('content' => _("Picture"), 'cellArgs' => array('style' => 'border: 2px solid black'))); +$explainTable->addElement(array('content' => _("Movie"), 'cellArgs' => array('style' => 'border: 2px dotted black'))); +$explainTable->addElement(array('content' => _("Subalbum") , 'cellArgs' => array('style' => 'border: 3px double black'))); +$explainTable->addElement(array('content' => _("Selected") , 'cellArgs' => array('style' => 'border: 2px dashed black'))); +$explainTable->addElement(array('content' => _("Visible") , 'cellArgs' => array('align' => 'center', 'colspan' => 2, 'style' => 'color: green'))); +$explainTable->addElement(array('content' => _("Hidden") , 'cellArgs' => array(' align' => 'center', 'colspan' => 2, 'style' => 'color: red'))); + +?> +

render(); ?>
+
+ +
+ "rearr_form", "method" => "POST")); +?> + + +setAttrs(array('width' => '100%', 'cellspacing' => 0, 'cellpadding' => 2)); + +$pictureTable->setColumnCount($cols); + +$pictureTable->addElement(array( + 'content' => ''. + '', + 'cellArgs' => array('colspan' => $cols, 'align' => 'right'))); + +$list = array(); +$j = 1; +$page = 1; + +for ($i = getNextPhoto(0), $i = 1; $i <= $numPhotos; $i = getNextPhoto($i)) { + if ($j++==($cols*$rows) || $page == 1) { + $pictureTable->addElement(array( + 'content' => sprintf(_("******* Page %s *******"), $page), + 'cellArgs' => array('colspan' => $cols, 'align' => 'center'))); + + $j = 1; + $page++; + } + + $attrs = 'id="im_'.$i.'" onclick="doclick('.$i.')" style="padding: 2px; border: ' + . ($gallery->album->isHidden($i) ? ' red' : ' green'); + + if ($gallery->album->isAlbum($i)) { + $myAlbumName = $gallery->album->getAlbumName($i); + $myAlbum = new Album(); + $myAlbum->load($myAlbumName); + $tag = $myAlbum->getHighlightTag(0,$attrs. ' 3px double"'); + } elseif ($gallery->album->isMovieByIndex($i)) { + $tag = $gallery->album->getThumbnailTag($i,0,$attrs.' 2px dotted"'); + } else { + $tag = $gallery->album->getThumbnailTag($i,0,$attrs.' 2px solid"'); + } + + $pictureTable->addElement(array('content' => $tag, 'cellArgs' => array('align' => 'center'))); + + $list[] = $i; +} + +$pictureTable->addElement(array( + 'content' => ''. + '', + 'cellArgs' => array('colspan' => $cols, 'align' => 'right'))); + +echo $pictureTable->render(); +?> + +
+ + + + + \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/register.php gallery-1.5.1/register.php --- gallery-1.5-pl1/register.php 2005-03-10 03:29:36.000000000 +0100 +++ gallery-1.5.1/register.php 2005-09-13 00:40:44.000000000 +0200 @@ -17,9 +17,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: register.php,v 1.28.2.1 2005/03/10 02:29:36 cryptographite Exp $ + * $Id: register.php,v 1.29.2.2 2005/09/12 22:40:44 dmolavi Exp $ */ ?> +

- +

"> diff -Naur gallery-1.5-pl1/rotate_photo.php gallery-1.5.1/rotate_photo.php --- gallery-1.5-pl1/rotate_photo.php 2005-03-10 03:29:37.000000000 +0100 +++ gallery-1.5.1/rotate_photo.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: rotate_photo.php,v 1.50.2.1 2005/03/10 02:29:37 cryptographite Exp $ + * $Id: rotate_photo.php,v 1.51.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> -app->tmpDir . "/upload." . genGUID(); - $od = @fopen($file, "wb"); - if ($id && $od) { - while (!feof($id)) { - fwrite($od, fread($id, 65536)); - set_time_limit($gallery->app->timeLimit); - } - fclose($id); - fclose($od); - } - - /* Make sure we delete this file when we're through... */ - $temp_files[$file]=1; - /* If this is an image or movie - add it to the processor array */ + /** + * If this is an image or movie - + * copy it locally and add it to the processor array + */ if (acceptableFormat($urlExt) || acceptableArchive($urlExt)) { - /* Add it to userfile */ - $_FILES['userfile']['name'][] = $name; - $_FILES['userfile']['tmp_name'][] = $file; + + /* copy file locally + * use fopen instead of fs_fopen to prevent directory and filename disclosure + */ + $file = $gallery->app->tmpDir . "/upload." . genGUID(); + $od = @fopen($file, "wb"); + if ($id && $od) { + while (!feof($id)) { + fwrite($od, fread($id, 65536)); + set_time_limit($gallery->app->timeLimit); + } + fclose($id); + fclose($od); + } + /* Make sure we delete this file when we're through... */ + $temp_files[$file]=1; + + /* Add it to userfile */ + $_FILES['userfile']['name'][] = $name; + $_FILES['userfile']['tmp_name'][] = $file; + } else { - /* Slurp the file */ - processingMsg(sprintf(_("Parsing %s for images..."), $url)); - $fd = fs_fopen ($file, "r"); - $contents = fread ($fd, fs_filesize ($file)); - fclose ($fd); - - /* We'll need to add some stuff to relative links */ - $base_url = $url_stuff["scheme"] . '://' . $url_stuff["host"]; - $base_dir = ''; - if (isset($url_stuff["port"])) { - $base_url .= ':' . $url_stuff["port"]; - } - - /* Hack to account for broken dirname - * This has to make the ugly assumption that the URL is either a - * directory (with or without trailing /), or a filename containing a "." - * This prevents a directory without a trailing / from being inadvertantly - * dropped from resulting URLs. - */ - if (ereg("/$", $url_stuff["path"]) || !ereg("\.", $name)) { - $base_dir = $url_stuff["path"]; - } else { - $base_dir = dirname($url_stuff["path"]); - } - - /* Make sure base_dir ends in a / ( accounts for empty base_dir ) */ - if (!ereg("/$", $base_dir)) { - $base_dir .= '/'; - } + /* Slurp the file */ + processingMsg(sprintf(_("Parsing %s for images..."), $url)); + $contents = fs_file_get_contents($url); + + /* We'll need to add some stuff to relative links */ + $base_url = $url_stuff["scheme"] . '://' . $url_stuff["host"]; + $base_dir = ''; + if (isset($url_stuff["port"])) { + $base_url .= ':' . $url_stuff["port"]; + } + + /* Hack to account for broken dirname + * This has to make the ugly assumption that the URL is either a + * directory (with or without trailing /), or a filename containing a "." + * This prevents a directory without a trailing / from being inadvertantly + * dropped from resulting URLs. + */ + if (ereg("/$", $url_stuff["path"]) || !ereg("\.", $name)) { + $base_dir = $url_stuff["path"]; + } else { + $base_dir = dirname($url_stuff["path"]); + } + + /* Make sure base_dir ends in a / ( accounts for empty base_dir ) */ + if (!ereg("/$", $base_dir)) { + $base_dir .= '/'; + } $things = array(); $results =array(); - - while ($cnt = eregi('(src|href)="?([^" >]+\.' . acceptableFormatRegexp() . ')[" >]', - $contents, - $results)) { - set_time_limit($gallery->app->timeLimit); - $things[$results[2]]=1; - $contents = str_replace($results[0], "", $contents); - } - /* Add each unique link to an array we scan later */ + if (preg_match_all('{(?:src|href)\s*=\s*(["\'])([^\'">]+\.'. acceptableFormatRegexp() .')(?:\1)}i', $contents, $matches)) { + foreach ($matches[2] as $url) { + $things[$url] = 1; + } + } + + /* Add each unique link to an array we scan later */ foreach (array_keys($things) as $thing) { /* @@ -253,7 +262,7 @@

app->debug == "yes") { - // Print meta data - print "\n"; - $row = 0; - foreach ($image_info as $info) { - print ""; - if ($row == 0) { - $keys = array_keys($info); - foreach ($keys as $key) { - print ""; - } - print "\n"; - } - foreach ($keys as $key) { - print ""; - } - $row++; - print "\n"; +if (isDebugging()) { + // Print meta data + print "
$key
".$info[$key]."
\n"; + $row = 0; + foreach ($image_info as $info) { + print ""; + if ($row == 0) { + $keys = array_keys($info); + foreach ($keys as $key) { + print ""; + } + print "\n"; } - print "
$key
\n"; + foreach ($keys as $key) { + print "".$info[$key].""; + } + $row++; + print "\n"; + } + print "\n"; } // $captionMetaFields will store the names (in order of priority to set caption to) $captionMetaFields = array("Caption", "Title", "Description", "Persons"); +$upload_started = false; /* Now we start processing the given Files */ while (isset($_FILES['userfile']['tmp_name']) && sizeof($_FILES['userfile']['tmp_name'])) { + $upload_started = true; $name = array_shift($_FILES['userfile']['name']); $file = array_shift($_FILES['userfile']['tmp_name']); if (!empty($usercaption) && is_array($usercaption)) { @@ -303,9 +314,6 @@ if (!isset($caption)) { $caption=""; } - if (get_magic_quotes_gpc()) { - $caption=stripslashes($caption); - } if ($name) { $extra_fields = array(); @@ -352,16 +360,16 @@ } if (!empty($temp_files)) { - /* Clean up the temporary url file */ - foreach ($temp_files as $tf => $junk) { - fs_unlink($tf); - } + /* Clean up the temporary url file */ + foreach ($temp_files as $tf => $junk) { + fs_unlink($tf); + } } ?>
@@ -384,25 +392,26 @@ ?>

- - - - -
- 'uploadurl_form', "method" => "POST"), array('type' => 'popup')); - /* Allow user to select which files to grab - only show url right now ( no image previews ) */ - sort($image_tags); - foreach ( $image_tags as $image_src) { - print "\t$image_src
\n"; - } -?> -
+ /* Allow user to select which files to grab - only show url right now ( no image previews ) */ + sort($image_tags); + $selectSize = (sizeof($image_tags) > 20) ? 20 : sizeof($image_tags); + + echo '\n"; - +/* REVISIT - it'd be nice to have these functions get shoved + into util.php at some time - maybe added functionality to the makeFormIntro? */ +?>

app->default["thumb_size"]; if ($gallery->app->showSearchEngine == 'no' && !$gallery->user->isAdmin()) { - header('Location: ' . makeAlbumURL()); - return; + header('Location: ' . makeAlbumURL()); + return; } -if (!$GALLERY_EMBEDDED_INSIDE) { - doctype(); +if (!$GALLERY_EMBEDDED_INSIDE) { + doctype(); ?> @@ -46,40 +46,23 @@ - - - - -
: - -
- - - +$adminbox['text'] = ''. _("Search") .''; +$adminbox['commands'] = '['. _("return to gallery") .'] '; - -'.$gallery->app->galleryTitle .''; -$breadtext[0] = _("Gallery") .': '.$gallery->app->galleryTitle .''; -$breadcrumb["text"] = $breadtext; -$breadcrumb["bordercolor"] = $borderColor; -$breadcrumb["top"] = true; -$breadcrumb["bottom"] = true; +includeLayout('navtablebegin.inc'); +includeLayout('adminbox.inc'); +includeLayout('navtablemiddle.inc'); includeLayout('breadcrumb.inc'); -?> - -albumList; @@ -88,226 +71,212 @@ $albumMatch = 0; $skip = array(); $text = array(); -if ($searchstring) { - $origstr = $searchstring; - $searchstring = escapeEregChars($searchstring); - $searchstring = str_replace ("\\*", ".*", $searchstring); - $searchExpr = "{(]*{$searchstring}[^<>]*>)(.*(?=))()|({$searchstring})}Usi"; - $searchRepl = '\1\2\4\3'; - - $uid = $gallery->user->getUid(); - for ($i = 0; $i<$numAlbums; $i++) { - $searchAlbum = $list[$i]; - - if (!$gallery->user->isAdmin() && $searchAlbum->isHiddenRecurse()) { - // One of the parents of this album is hidden - do not show it to users - continue; - } - - if (!$gallery->user->isAdmin() && !$searchAlbum->canReadRecurse($uid)) { - // User is not allowed to search through see album - continue; - } - if ($searchAlbum->versionOutOfDate()) { - $skip[] = $searchAlbum; - continue; - } - - // Build navigationslinks to the album. - $parentNameArray = getParentAlbums($searchAlbum); - if(count($parentNameArray) != 0) { - $parentURLString = ''; - foreach($parentNameArray as $pName=>$pTitle) { - $parentURLString .= "".$pTitle." » "; - } - } - // initialize values - unset($text); - - $searchTitle = $searchAlbum->fields['title']; - $searchDescription = $searchAlbum->fields['description']; - $searchSummary = $searchAlbum->fields['summary']; - - $matchTitle = eregi("$searchstring", $searchTitle); - $matchDescription = eregi("$searchstring", $searchDescription); - $matchSummary = eregi("$searchstring", $searchSummary); - - if ($matchTitle || $matchDescription || $matchSummary) { - $searchTitle = preg_replace($searchExpr, $searchRepl, $searchTitle); // cause search word to be bolded - - $searchDescription = preg_replace($searchExpr, $searchRepl, $searchDescription); // cause search word to be bolded - $searchSummary = preg_replace($searchExpr, $searchRepl, $searchSummary); // cause search word to be bolded - $photoURL = makeAlbumUrl($searchAlbum->fields['name']); - - $text[] = '

'. $searchTitle .'
'; - - if(!empty($searchDescription)) { - $text[] = '
'. $searchDescription . '
'; - } - if ($matchSummary) { // only print summary if it matches - $text[] = '
'. $searchSummary .'
'; - } - - $searchResult['albums'][]=array( - "photolink" => $searchAlbum->getHighlightTag($thumbSize), - "photoURL" => $photoURL, - "Text" => $text - ); - } - - /* now search for photos .. */ - - $numPhotos = $searchAlbum->numPhotos(1); - for ($j = 1; $j <= $numPhotos; $j++) { - if ($searchAlbum->isHidden($j)) { - continue; - } - - $searchCaption = _("Caption: ") . $searchAlbum->getCaption($j); - $searchCaption .= $searchAlbum->getCaptionName($j); - $searchKeywords = $searchAlbum->getKeywords($j); - - $commentMatch = 0; - $commentText = ""; - if ($searchAlbum->canViewComments($uid) || $gallery->user->isAdmin()) { - for ($k = 1; $k <= $searchAlbum->numComments($j); $k++) { - // check to see if there are any comment matches - $comment = $searchAlbum->getComment($j, $k); - $searchComment = $comment->getName(); - if ($gallery->user->isAdmin()) { - $searchComment .= " @ ".$comment->getIPNumber(); - } - $searchComment .= ": ".$comment->getCommentText(); - if (eregi($searchstring, $searchComment)) { - if (!$commentMatch) { - $commentText = _("Matching Comments").":
"; - $commentMatch = 1; - } - $searchComment = preg_replace($searchExpr, $searchRepl, $searchComment); - $commentText .= "\n". $searchComment . "

"; - } - } - } - - $extraFieldsText = ""; - $extraFieldsMatch = 0; - foreach ($searchAlbum->getExtraFields() as $field) { - $fieldValue=$searchAlbum->getExtraField($j, $field); - if (eregi($searchstring, $fieldValue)) { - $fieldValue = preg_replace($searchExpr, $searchRepl, $fieldValue); - $extraFieldsText .= "$field: $fieldValue

"; - $extraFieldsMatch = 1; - } - } - - $captionMatch = eregi($searchstring, $searchCaption); - $keywordMatch = eregi($searchstring, $searchKeywords); - - unset($text); - - if ($captionMatch || $keywordMatch || $commentMatch || $extraFieldsMatch) { - $id = $searchAlbum->getPhotoId($j); - // cause search word to be bolded - $searchCaption = preg_replace($searchExpr, $searchRepl, $searchCaption); - $searchKeywords = preg_replace($searchExpr, $searchRepl, $searchKeywords); - - $text[] = '
'. _("From Album") .":  ". - $parentURLString . - "fields['name']) . "\">" . - $searchAlbum->fields['title'] . "
"; - $text[] = '
'. $searchCaption .'
'; - if ($keywordMatch) { // only display Keywords if there was a keyword match - $text[] = "
". _("KEYWORDS") .":   $searchKeywords

"; - } - $text[] = $commentText; - $text[] = $extraFieldsText; - - $searchResult['images'][]=array( - 'photolink' => $searchAlbum->getThumbnailTag($j, $thumbSize), - 'photoURL' => makeAlbumUrl($searchAlbum->fields['name'], $id), - 'Text' => $text - ); - } - } - } - - - /* Now we show what we found ;) */ - $resultTexts=array( - 'albums' => array( - 'found' => sprintf(_("Albums containing %s"), "\"$origstr\""), - 'none' => _("No Album Matches") - ), - 'images' => array( - 'found' => sprintf(_("Photos containing %s in caption or comment"), "\"$origstr\""), - 'none' => _("No Photo Matches") - )); - - - foreach ($resultTexts as $key => $text) { - if (!empty($searchResult[$key])) { - echo '
' .$text['found'] . '
'; - echo ''; - foreach ($searchResult[$key] as $searchdraw) { - $searchdraw["bordercolor"] = $borderColor; - $searchdraw["top"] = true; - includeLayout('searchdraw.inc'); - } - echo '
'; - } else { - echo '
'. $text['none'] . '
'; - } - } - - if (sizeof($skip) > 0) { - echo gallery_error(sprintf(_("Some albums not searched as they require upgrading to the latest version of %s first."),Gallery())); - if ($gallery->user->isAdmin()) { - print "
"; - echo popup_link(_("Upgrade all albums."), "upgrade_album.php"); - print "
("; - $join_text=''; - foreach($skip as $album) { - $link = makeGalleryUrl("view_album.php", - array("set_albumName" => $album->fields["name"])); - echo $join_text."".$album->fields["name"] - .""; - $join_text=", "; - } - print ")"; - } - echo "

"; - } - +if (!empty($searchstring)) { + $origstr = $searchstring; + $searchstring = escapeEregChars($searchstring); + $searchstring = str_replace ("\\*", ".*", $searchstring); + $searchExpr = "{(]*{$searchstring}[^<>]*>)(.*(?=))()|({$searchstring})}Usi"; + $searchRepl = '\1\2\4\3'; + + $uid = $gallery->user->getUid(); + for ($i = 0; $i<$numAlbums; $i++) { + $searchAlbum = $list[$i]; + + if (!$gallery->user->isAdmin() && $searchAlbum->isHiddenRecurse()) { + // One of the parents of this album is hidden - do not show it to users + continue; + } + + if (!$gallery->user->isAdmin() && !$searchAlbum->canReadRecurse($uid)) { + // User is not allowed to search through see album + continue; + } + if ($searchAlbum->versionOutOfDate()) { + $skip[] = $searchAlbum; + continue; + } + + // Build navigationslinks to the album. + $parentNameArray = $searchAlbum->getParentAlbums(false); + $parentURLString = ''; + if(count($parentNameArray) != 0) { + foreach($parentNameArray as $nr => $pAlbum) { + $parentURLString .= '' .$pAlbum['title'] .' » '; + } + } + // initialize values + unset($text); + + $searchTitle = $searchAlbum->fields['title']; + $searchDescription = $searchAlbum->fields['description']; + $searchSummary = $searchAlbum->fields['summary']; + $searchName = $searchAlbum->fields['name']; + + $matchTitle = eregi("$searchstring", $searchTitle); + $matchDescription = eregi("$searchstring", $searchDescription); + $matchSummary = eregi("$searchstring", $searchSummary); + $matchName = eregi("$searchstring", $searchName); + + if ($matchTitle || $matchDescription || $matchSummary | $searchName) { + $searchTitle = preg_replace($searchExpr, $searchRepl, $searchTitle); // cause search word to be bolded + + $searchDescription = preg_replace($searchExpr, $searchRepl, $searchDescription); // cause search word to be bolded + $searchSummary = preg_replace($searchExpr, $searchRepl, $searchSummary); // cause search word to be bolded + $photoURL = makeAlbumUrl($searchAlbum->fields['name']); + + $text[] = '

'. $searchTitle .'
'; + + if(!empty($searchDescription)) { + $text[] = '
'. $searchDescription . '
'; + } + if ($matchSummary) { // only print summary if it matches + $text[] = '
'. $searchSummary .'
'; + } + + $searchResult['albums'][]=array( + 'photolink' => $searchAlbum->getHighlightTag($thumbSize), + 'photoURL' => $photoURL, + 'Text' => $text + ); + } + + /* now search for photos .. */ + + $numPhotos = $searchAlbum->numPhotos(1); + for ($j = 1; $j <= $numPhotos; $j++) { + if ($searchAlbum->isHidden($j)) { + continue; + } + + $photo = $searchAlbum->getPhoto($j); + $searchCaption = _("Caption: ") . $photo->getCaption(); + $searchCaption .= $searchAlbum->getCaptionName($j); + $searchKeywords = $photo->getKeywords(); + $searchName = $photo->image->name; + + $commentMatch = 0; + $commentText = ''; + if ($searchAlbum->canViewComments($uid) || $gallery->user->isAdmin()) { + for ($k = 1; $k <= $searchAlbum->numComments($j); $k++) { + // check to see if there are any comment matches + $comment = $searchAlbum->getComment($j, $k); + $searchComment = $comment->getName(); + if ($gallery->user->isAdmin()) { + $searchComment .= " @ ".$comment->getIPNumber(); + } + $searchComment .= ": ".$comment->getCommentText(); + if (eregi($searchstring, $searchComment)) { + if (!$commentMatch) { + $commentText = _("Matching Comments").":
"; + $commentMatch = 1; + } + $searchComment = preg_replace($searchExpr, $searchRepl, $searchComment); + $commentText .= "\n". $searchComment . "

"; + } + } + } + + $extraFieldsText = ''; + $extraFieldsMatch = 0; + foreach ($searchAlbum->getExtraFields() as $field) { + $fieldValue=$searchAlbum->getExtraField($j, $field); + if (eregi($searchstring, $fieldValue)) { + $fieldValue = preg_replace($searchExpr, $searchRepl, $fieldValue); + $extraFieldsText .= "$field: $fieldValue

"; + $extraFieldsMatch = 1; + } + } + + $captionMatch = eregi($searchstring, $searchCaption); + $keywordMatch = eregi($searchstring, $searchKeywords); + $nameMatch = eregi($searchstring, $searchName); + + unset($text); + + if ($captionMatch || $keywordMatch || $commentMatch || $extraFieldsMatch || $nameMatch) { + $id = $searchAlbum->getPhotoId($j); + // cause search word to be bolded + $searchCaption = preg_replace($searchExpr, $searchRepl, $searchCaption); + $searchKeywords = preg_replace($searchExpr, $searchRepl, $searchKeywords); + + $text[] = '
'. _("From Album") .":  ". + $parentURLString . + "fields['name']) . "\">" . + $searchAlbum->fields['title'] . "
"; + $text[] = '
'. $searchCaption .'
'; + if ($keywordMatch) { // only display Keywords if there was a keyword match + $text[] = '
'. _("KEYWORDS") .":   $searchKeywords

"; + } + $text[] = $commentText; + $text[] = $extraFieldsText; + + $searchResult['images'][]=array( + 'photolink' => $searchAlbum->getThumbnailTag($j, $thumbSize), + 'photoURL' => makeAlbumUrl($searchAlbum->fields['name'], $id), + 'Text' => $text + ); + } + } + } + + + /* Now we show what we found ;) */ + $resultTexts=array( + 'albums' => array( + 'found' => sprintf(_("Albums containing %s"), "\"$origstr\""), + 'none' => _("No Album Matches") + ), + 'images' => array( + 'found' => sprintf(_("Photos containing %s in caption, comment or name."), "\"$origstr\""), + 'none' => _("No Photo Matches") + ) + ); + + foreach ($resultTexts as $key => $text) { + if (!empty($searchResult[$key])) { + echo '
' .$text['found'] . '
'; + echo ''; + foreach ($searchResult[$key] as $searchdraw) { + $searchdraw["bordercolor"] = $borderColor; + $searchdraw["top"] = true; + includeLayout('searchdraw.inc'); + } + echo '
'; + } else { + echo '
'. $text['none'] . '
'; + } + } + + if (sizeof($skip) > 0) { + echo gallery_error(sprintf(_("Some albums not searched as they require upgrading to the latest version of %s first."),Gallery())); + if ($gallery->user->isAdmin()) { + print "
"; + echo popup_link(_("Upgrade all albums."), "upgrade_album.php"); + print "
("; + $join_text=''; + foreach($skip as $album) { + $link = makeGalleryUrl("view_album.php", + array("set_albumName" => $album->fields["name"])); + echo $join_text."".$album->fields["name"] .""; + $join_text=", "; + } + print ")"; + } + echo "

"; + } } else { -/* No searchstring was given */ -?> -
titles, descriptions and comments") ?>:
- - - - - -
- - !"> -
- -"; + echo _("Search the Gallery's Album and Photo titles, descriptions and comments."); + echo "\n
"; + echo addSearchForm($searchstring, 'center'); + echo "

"; } -/* Bottom of the page */ -echo "
"; -$breadtext[0] = _("Gallery") .": ".$gallery->app->galleryTitle.""; -$breadcrumb["text"] = $breadtext; -$breadcrumb["bordercolor"] = $borderColor; -$breadcrumb["top"] = true; -$breadcrumb["bottom"] = true; -includeLayout('breadcrumb.inc'); - -includeLayout('ml_pulldown.inc'); -includeHtmlWrap("search.footer"); +echo '
'; +includeHtmlWrap("gallery.footer"); if (!$GALLERY_EMBEDDED_INSIDE) { ?> diff -Naur gallery-1.5-pl1/session.php gallery-1.5.1/session.php --- gallery-1.5-pl1/session.php 2005-03-23 09:51:45.000000000 +0100 +++ gallery-1.5.1/session.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: session.php,v 1.46.2.4 2005/03/23 08:51:45 cryptographite Exp $ + * $Id: session.php,v 1.51.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> app->sessionVar)) { - $gSessionVar = "gallery_session_" . md5(getcwd()); -} else { - $gSessionVar = $gallery->app->sessionVar . "_" . md5($gallery->app->userDir); -} - -if (isset($_SESSION[$gSessionVar])) { - /* Get a simple reference to the session container (for convenience) */ - $gallery->session =& $_SESSION[$gSessionVar]; - - /* DISABLED BY THE "0 &&" BELOW */ - // Allow session-sharing in devMode so that pages can be validated using the W3 validation links - if (0 && ($gallery->app->devMode != "yes" && !empty($gallery->session->remoteHost)) && $gallery->session->remoteHost != $_SERVER['REMOTE_ADDR']) { - printf('Attempted session access from different IP address. Please re-login.', $gallery->app->photoAlbumURL . '?PHPSESSID='); - exit; - } -} else { - /* Create a new session container */ - if (!empty($useStdClass)) { - $_SESSION[$gSessionVar] = new stdClass(); + if (empty($gallery->app->sessionVar)) { + $gSessionVar = "gallery_session_" . md5(getcwd()); } else { - $_SESSION[$gSessionVar] = new GallerySession(); + $gSessionVar = $gallery->app->sessionVar . "_" . md5($gallery->app->userDir); } - /* Get a simple reference to the session container (for convenience) */ - $gallery->session =& $_SESSION[$gSessionVar]; + if (isset($_SESSION[$gSessionVar])) { + /* Get a simple reference to the session container (for convenience) */ + $gallery->session =& $_SESSION[$gSessionVar]; + + /* DISABLED BY THE "0 &&" BELOW */ + // Allow session-sharing in devMode so that pages can be validated using the W3 validation links + if (0 && ($gallery->app->devMode != "yes" && !empty($gallery->session->remoteHost)) && $gallery->session->remoteHost != $_SERVER['REMOTE_ADDR']) { + printf('Attempted session access from different IP address. Please re-login.', $gallery->app->photoAlbumURL . '?PHPSESSID='); + exit; + } + } else { + /* Create a new session container */ + if (!empty($useStdClass)) { + $_SESSION[$gSessionVar] = new stdClass(); + } else { + $_SESSION[$gSessionVar] = new GallerySession(); + } + + /* Get a simple reference to the session container (for convenience) */ + $gallery->session =& $_SESSION[$gSessionVar]; - /* Tag this session with the gallery version */ - $gallery->session->version = $gallery->version; - $gallery->session->sessionStart = time(); - $gallery->session->remoteHost = $_SERVER['REMOTE_ADDR']; + /* Tag this session with the gallery version */ + $gallery->session->version = $gallery->version; + $gallery->session->sessionStart = time(); + $gallery->session->remoteHost = $_SERVER['REMOTE_ADDR']; + } } +// Create or resume our session +createGallerySession(); + update_session_var("albumName"); update_session_var("version"); update_session_var("albumListPage"); diff -Naur gallery-1.5-pl1/setup/backup_albums.php gallery-1.5.1/setup/backup_albums.php --- gallery-1.5-pl1/setup/backup_albums.php 2005-03-10 03:36:33.000000000 +0100 +++ gallery-1.5.1/setup/backup_albums.php 2005-09-13 00:41:29.000000000 +0200 @@ -17,9 +17,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: backup_albums.php,v 1.18.2.3 2005/03/10 02:36:33 cryptographite Exp $ + * $Id: backup_albums.php,v 1.22.2.1 2005/09/12 22:41:29 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/setup/check.inc gallery-1.5.1/setup/check.inc --- gallery-1.5-pl1/setup/check.inc 2005-03-10 03:36:34.000000000 +0100 +++ gallery-1.5.1/setup/check.inc 2005-09-13 00:41:29.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: check.inc,v 1.43.2.1 2005/03/10 02:36:34 cryptographite Exp $ + * $Id: check.inc,v 1.44.2.1 2005/09/12 22:41:29 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/setup/check_mail.php gallery-1.5.1/setup/check_mail.php --- gallery-1.5-pl1/setup/check_mail.php 2005-04-04 18:07:45.000000000 +0200 +++ gallery-1.5.1/setup/check_mail.php 2005-09-13 00:41:29.000000000 +0200 @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: check_mail.php,v 1.9.2.3 2005/04/04 16:07:45 cryptographite Exp $ + * $Id: check_mail.php,v 1.13.2.3 2005/09/12 22:41:29 dmolavi Exp $ */ ?> @@ -41,15 +39,19 @@ list($submit, $email_address) = getRequestVar(array('submit', 'email_address')); if (isset($submit)) { - if(gallery_validate_email($email_address)) { - $ret = gallery_mail($email_address, sprintf(_("Test email from %s"), Gallery()), - _("This email was automatically generated."). "\n\n" . + if(check_email($email_address)) { + $to = $email_address; + $subject = sprintf(_("Test email from %s"), Gallery()); + $msg = _("This email was automatically generated."). "\n\n" . _("If you recevied this in error, then please disregard, as you should not receive any similar emails.") . "\n\n" . sprintf(_("If you were expecting email from the %s installation at %s, then Congratulations! Email is working and you can enable the %s email functions."), Gallery(), "http://" . getenv("SERVER_NAME") . $GALLERY_URL, - Gallery()) . "\n\n", - ''); + Gallery()) . "\n\n"; + + $logmsg = _("Attempt to send Testmail from config wizard."); + + $ret = gallery_mail($to, $subject, $msg, $logmsg); if ($ret) { echo ''; echo ''; diff -Naur gallery-1.5-pl1/setup/check_netpbm.php gallery-1.5.1/setup/check_netpbm.php --- gallery-1.5-pl1/setup/check_netpbm.php 2005-03-10 03:36:34.000000000 +0100 +++ gallery-1.5.1/setup/check_netpbm.php 2005-09-13 00:41:29.000000000 +0200 @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: check_netpbm.php,v 1.35.2.1 2005/03/10 02:36:34 cryptographite Exp $ + * $Id: check_netpbm.php,v 1.36.2.2 2005/09/12 22:41:29 dmolavi Exp $ */ ?> @@ -38,8 +36,8 @@
after you have run the config wizard, if you have had problems with your %s installation that the wizard did not detect."), $app_name) + echo sprintf(_("This script is designed to examine your %s installation to see if it is ok to be used by Gallery."), $app_name); + echo sprintf(_("You should run this script after you have run the config wizard, if you have had problems with your %s installation that the wizard did not detect."), $app_name) ?>

diff -Naur gallery-1.5-pl1/setup/check_versions.php gallery-1.5.1/setup/check_versions.php --- gallery-1.5-pl1/setup/check_versions.php 2005-03-10 03:36:34.000000000 +0100 +++ gallery-1.5.1/setup/check_versions.php 2005-09-13 00:41:29.000000000 +0200 @@ -15,17 +15,18 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: check_versions.php,v 1.20.2.1 2005/03/10 02:36:34 cryptographite Exp $ + * $Id: check_versions.php,v 1.22.2.2 2005/09/12 22:41:29 dmolavi Exp $ */ ?> - <?php echo _("Check Versions") ?> @@ -46,10 +47,7 @@

'. _("SUCCESS!"). '
"; - } else if ($fields[3] == "block_start") { - $buf .= "\n"; - } else { - $buf .= "\n"; - $buf .= "\n\t"; - $buf .= "\n\t"; - $buf .= "\n"; - $buf .= "\n"; - if (!empty($fields[2])) { - $buf .= "\n\t"; - $buf .= "\n\n"; - } - } - - return $buf; -} - -function make_attrs($attrList) { - $attrs = ''; - if ($attrList) { - /* - ** I commented this out, because it produces non valid html for textareas. - ** 06.04.2004, Jens Tkotz - if (!isset($attrList["size"])) { - $attrList["size"] = 40; - } - */ - - foreach ($attrList as $attrKey => $attrVal) { - $attrs .= "$attrKey=$attrVal "; - } - } - return $attrs; -} - -function make_fields($key, $arr) { - if (isset($arr["prompt"])) { - $col1 = $arr["prompt"]; - } else { - $col1 = ""; - } - if (isset($arr["type"]) && $arr["type"] == "hidden") { - $col2 = form_input($key, $arr); - } else if (isset($arr["choices"])) { - $col2 = form_choice($key, $arr); - } else if (isset($arr["multiple_choices"])) { - $col2 = form_multiple_choice($key, $arr); - } else if (!strcmp($arr["type"], "textarea")) { - $col2 = form_textarea($key, $arr); - } else if (isset($arr["type"]) && $arr["type"] == "text") { - $col2 = form_input($key, $arr); - } else if (isset($arr["type"]) && $arr["type"] == "password") { - $col2 = form_password($key, $arr); - } else if (isset($arr["type"]) && $arr["type"] == "nv_pairs") { - $col2 = form_nv_pairs($key, $arr); - } else if (isset($arr['type']) && $arr['type'] == 'print_services') { - $col2 = form_print_services($key, $arr); - } else { - $col2 =""; - } - if (isset($arr["desc"])) { - $col3 = $arr["desc"]; - } else { - $col3 = ""; - } - $col4 = isset($arr["type"]) ? $arr["type"] : NULL; - $col5 = isset($arr["required"]) ? true : NULL; - - return array($col1, $col2, $col3,$col4,$col5); -} - -function form_textarea($key, $arr) { - $attrs = make_attrs($arr["attrs"]); - return ""; -} - -function form_input($key, $arr) { - if ($arr["type"]) { - $type = "type=\"$arr[type]\""; - } - if (isset($arr["attrs"])) { - $attrs = make_attrs($arr["attrs"]); - } else { - $attrs = ''; - } - - return ""; -} - -function form_password($key, $arr) { - if (isset($arr["attrs"])) { - $attrs = make_attrs($arr["attrs"]); - } else { - $attrs = ''; - } - - if (empty($arr['value'])) { - $arr['value'] = array('', '', '', ''); - } elseif (!is_array($arr['value'])) { - $arr['value'] = array($arr['value'], $arr['value'], $arr['value'], $arr['value']); - } - return " " - . '
' - . " " - . _('Please retype your password here') - . "\n" - . "\n"; -} - -function form_nv_pairs($key, $arr) { - if (isset($arr["attrs"])) { - $attrs = make_attrs($arr["attrs"]); - } else { - $attrs = ''; - } - $x=0; - $buf="\n
',''); } else { @@ -62,7 +60,7 @@ diff -Naur gallery-1.5-pl1/setup/config_data.inc gallery-1.5.1/setup/config_data.inc --- gallery-1.5-pl1/setup/config_data.inc 2005-04-14 03:48:31.000000000 +0200 +++ gallery-1.5.1/setup/config_data.inc 2005-09-13 00:41:29.000000000 +0200 @@ -15,14 +15,16 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: config_data.inc,v 1.265.2.5 2005/04/14 01:48:31 cryptographite Exp $ + * $Id: config_data.inc,v 1.283.2.2 2005/09/12 22:41:29 dmolavi Exp $ */ ?> $trash) { if(!empty($stats['types'][$key]['linktext'])) { @@ -85,6 +87,10 @@ '
' . _("Note:"). ' ' . _("The site also has binaries available for assorted operating systems. If you can't get it working, try leaving the ImageMagick path blank and using NetPBM instead."); +$common_messages["fail-imagemagick-partial"] = + _("I've found part of ImageMagick , but some critical components are missing (see below).") . " " . + $common_messages["getting-imagemagick"]; + $common_messages["open-basedir-active"] = '' . _("Note:"). ''. sprintf(_("Your PHP installation is configured with the %s restriction. This may make it difficult for Gallery to detect and verify your binaries, even if you've already successfully used the Config. Wizard in the past. Don't worry too much if this page gives warnings; your settings will still be saved properly."), @@ -185,6 +191,9 @@ 'func' => "check_graphics_im", 'fail-imagemagick' => _("I can't find ImageMagick. If it's installed and not in the path of the webserver user that's OK—you can specify the path to ImageMagick by hand on the following page. If it's not installed, you must install it. ") . $common_messages["getting-imagemagick"], + 'fail-imagemagick-partial' => + $common_messages["fail-imagemagick-partial"] . + "

" . _("If ImageMagick is installed and Gallery isn't finding it automatically that's OK—you can specify the path to ImageMagick by hand on the following page.") ." ", 'open-basedir-note' => $common_messages["open-basedir-active"] ), 'exif' => array( @@ -480,6 +489,12 @@ 1000 => _("Complete Tree")), 'value' => 1000, ), + 'microTree' => array( + 'prompt' => _("Replace album tree with micro thumbs"), + 'desc' => _("If you have set album tree to anything but off, this will display micro thumbs of the sub albums instead of the album tree."), + 'choices' => array('yes' => _("yes"), 'no' => _("no")), + 'value' => "no" + ), 'highlight_size' => array( 'prompt' => _("Highlight size"), 'desc' => _("The target size (in pixels) of thumbnails shown in the Gallery page (highlight images)."), @@ -732,21 +747,10 @@ ), 'emailGreeting' => array( 'prompt' => _("Welcome email message text"), - 'desc' => _("This email will be sent when new accounts are created.") . "

" . - sprintf(_("%s, %s and %s will be replaced by the fullname, user name and password of the newly created user."), - "!!FULLNAME!!", - "!!USERNAME!!", - "!!PASSWORD!!") . "

" . - sprintf(_("%s will be replaced by a link the new user can click on to create a new password"), - "!!NEWPASSWORDLINK!!") . "

" . - _("Leave this field blank to get the default message that can be translated into other languages. The default message is:") . - '

' . - str_replace("\n", "
", welcome_email(true)) . - '
', + 'desc' => placeholderDescription(), 'optional' => 1, 'type' => "textarea", 'value' => "", - 'attrs' => array('cols' => 50, 'rows' => 11)), 'selfReg' => array( 'prompt' => _("Allow visitors to self register."), @@ -770,13 +774,13 @@ 'value' => "no" ), 'adminCommentsEmail' => array( - 'desc' => _("This is allows the "admin" account to get email whenever a comment is added to any album"), + 'desc' => _("This allows the "admin" account to get email whenever a comment is added to any album"), 'prompt' => _("Admin comment email"), 'choices' => array('yes' => _("yes"), 'no' => _("no")), 'value' => "no" ), 'adminOtherChangesEmail' => array( - 'desc' => _("This is allows the "admin" account to get email whenever a change is made to any album"), + 'desc' => _("This allows the "admin" account to get email whenever a change is made to any album"), 'prompt' => _("Admin Other Changes email"), 'choices' => array('yes' => _("yes"), 'no' => _("no")), 'value' => "no" @@ -948,22 +952,21 @@ 'value' => "!!FULLNAME!! (!!USERNAME!!)", ), 'comments_addType' => array( - 'prompt' => _("Add Comments inside the photo page"), + 'prompt' => _("Add comments inside the photo page"), 'desc' => _("Do you want to have the possibility to add comments inside the view photo page, or do you prefer a link to a popup"), 'choices' => array ('popup' => _("Popup"), 'inside' => _("Inside")), 'value' => "popup" ), 'comments_length' => array( - 'prompt' => _("Maximum length of Comments"), + 'prompt' => _("Maximum length of comments"), 'desc' => _("Enter a suitable value for the maximum length of comments to prevent abuse. Gallery limits comments to no more than 1000 characters. This value will be used if less than 1000."), 'type' => "text", 'must-be-integer' => 1, 'value' => 300 ), 'comments_overview_for_all' => array( - 'prompt' => _("Can everybody see a Comments overview"), - 'desc' => _("Do you want to allow everybody to see a complete overview of all Comments of an Album. Set this to "no" if only admin and owners can use this feature."), - 'type' => "text", + 'prompt' => _("Can every permitted user see a comments overview"), + 'desc' => _("Do you want to allow every user who is allowed to view comments (set in permission) to see a complete overview of all comments of an Album? Set this to "no" if only admin and owners can use this feature."), 'choices' => array('yes' => _("yes"), 'no' => _("no")), 'value' => "no", ), @@ -1103,11 +1106,11 @@ '
'. _("Be aware that settings changed on this tab may have severe performance or security consequences and do so at your own risk.") . ''), - 'debug' => array( - 'prompt' => _("Debug mode"), - 'desc' => _("Turn debug mode on so that you can diagnose problems?") .'
'. _("Note: Dont leave this option on in production systems! Else you might show users more information about your Gallery and system than you want!") . '', - 'choices' => array('yes' => _("yes"), 'no' => _("no")), - 'value' => "no", + 'debuglevel' => array( + 'prompt' => _("Debug Level"), + 'desc' => _("Turn debug on so that you can diagnose problems?") .'
'. _("Note: Dont leave this option on in production systems! Else you might show users more information about your Gallery and system than you want!") . '', + 'choices' => array(0 => _("No Debug"), 1 => _("Normal"), 2 => _("High (former Debug 'on')")), + 'value' => 0, ), 'skipRegisterGlobals' => array( 'prompt' => _('Disable register_globals check'), @@ -1311,8 +1314,7 @@ // W3.org', 'value' => "black", - 'type' => "text", - 'attrs' => array('size' => 10), + 'type' => 'colorpicker' ), 'border' => array( 'prompt' => _("Border width"), @@ -1348,7 +1350,7 @@ 'prompt' => _("Resized image size"), 'desc' => _("When large images are added to an album, an intermediate version will automatically be generated at this size."), 'value' => 640, - 'choices' => array('off' => _("off"), 400 => 400, 500 => 500, 600 => 600, 640 => 640, 700 => 700, 800 => 800, 1024 => 1024) + 'choices' => array(0 => _("off"), 400 => 400, 500 => 500, 600 => 600, 640 => 640, 700 => 700, 800 => 800, 1024 => 1024) ), 'resize_file_size' => array( 'prompt' => _("Resized JPEG/PNG images file size"), @@ -1364,7 +1366,7 @@ '
'. _("Enabling this feature will leave you without a full size original image in your Gallery, but allows you to save limited hard drive space. Gallery will attempt to preserve JPEG comments and EXIF data for the shrunken image, but this will require either ImageMagick or the optional jhead programs (see Step 2)."), 'value' => 'off', - 'choices' => array('off' => _('off'), 400 => 400, 500 => 500, 600 => 600, 640 => 640, 700 => 700, 800 => 800, 1024 => 1024, 1280 => sprintf(_('%d (%d MPix)'), 1280, 1), 1600 => sprintf(_('%d (%d MPix)'), 1600, 2), 2048 => sprintf(_('%d (%d MPix)'), 2048, 3)) + 'choices' => array(0 => _('off'), 400 => 400, 500 => 500, 600 => 600, 640 => 640, 700 => 700, 800 => 800, 1024 => 1024, 1280 => sprintf(_('%d (%d MPix)'), 1280, 1), 1600 => sprintf(_('%d (%d MPix)'), 1600, 2), 2048 => sprintf(_('%d (%d MPix)'), 2048, 3)) ), 'max_file_size' => array( 'prompt' => _('Maximum JPEG/PNG image file size'), @@ -1411,27 +1413,8 @@ 'print_photos' => array( 'prompt' => _("Printing Services"), 'desc' => _("Allow visitors to print photos directly from the album. Fotoserve is based in the United Kindom and Fotokasten is a print service based in Germany so they are good for the European market. EZ Prints, PhotoWorks and Shutterfly are based in the United States. mPUSH is a service that allows you to send photos to cellular phones worldwide. All services will give a small donation to the Gallery project for every print you make. Using these services is a great way for you to help support this free software."), - 'type' => 'print_services', - 'services' => array( - 'photoaccess' => array( - 'name' => 'PhotoWorks', - 'url' => 'http://www.photoworks.com/'), - 'shutterfly' => array( - 'name' => 'Shutterfly', - 'url' => 'http://www.shutterfly.com/', - ), - 'fotoserve' => array( - 'name' => 'Fotoserve.com', - 'url' => 'http://www.fotoserve.com/', - ), - 'fotokasten' => array( - 'name' => 'Fotokasten', - 'url' => 'http://www.fotokasten.de/'), - 'mpush' => array( - 'name' => 'mPUSH', - 'url' => 'http://www.mpush.cc/', - 'desc' => _("mPUSH is a photo service that adds the ability to send thumbnail images to your, or a friend's, cellphone for a small fee."),), - ), + 'multiple_choices' => makeMultipleChoiceContent($services), +/* old .. needs to be fixed */ 'value' => array( 'fotokasten' => array( 'checked' => true), @@ -1454,6 +1437,13 @@ 'value' => 'gallery', 'type' => 'text', ), + 'ecards' => array( + 'prompt' => _("Enable Ecards ?"), + 'desc' => _("Set this to 'yes' to allow users to send a picure as eCard via eMail") . '
'. + '' . _("This option requires the Email feature to be enabled.") . '', + 'choices' => array("yes" => _("yes"), "no" => _("no")), + 'value' => 'no' + ), 'returnto' => array( 'prompt' => _("Gallery Link"), 'desc' => _("Display a link navigation from your album to the top level Gallery link within the album? If you turn this feature off, the user will not be able to navigate out of the album. This is only useful when you want to embed an album within a website and not allow users to (easily) view the other albums in the gallery."), @@ -1463,7 +1453,11 @@ 'defaultPerms' => array( 'prompt' => _("Default Album Permissions"), 'desc' => _("Defines the default set of permissions for an album. Specifically, who can see the album, and view its photos."), - 'choices' => array('everybody' => _("Everybody"), 'loggedin' => _("Logged-In Users")), + 'choices' => array( + 'everybody' => _("Everybody"), + 'loggedin' => _("Logged-In Users"), + 'nobody' => _("Nobody") + ), 'value' => "everybody", ), 'group4_end' => array ( @@ -1607,17 +1601,17 @@ 'horizontal' => _("Horizontal"), 'vertical' => _("Vertical"))) , 'poll_nv_pairs' => array( - 'prompt' => _("Vote words and values"), - 'desc' => _("This allows you to configure the actual text that will be displayed for each voting option, plus the number of points that option is worth."), - 'value' => array ( - array('name' => _("Excellent"), 'value' => 5), - array('name' => _("Very Good"), 'value' => 4), - array('name' => _("Good"), 'value' => 3), - array('name' => _("Average"), 'value' => 2), - array('name' => _("Poor"), 'value' => 1)), - 'type' => "nv_pairs", - 'verify-func' => "check_poll_nv_pairs", - 'size' => 9), + 'prompt' => _("Vote words and values"), + 'desc' => _("This allows you to configure the actual text that will be displayed for each voting option, plus the number of points that option is worth."), + 'value' => array ( + array('name' => _("Excellent"), 'value' => 5), + array('name' => _("Very Good"), 'value' => 4), + array('name' => _("Good"), 'value' => 3), + array('name' => _("Average"), 'value' => 2), + array('name' => _("Poor"), 'value' => 1)), + 'type' => "nv_pairs", + 'verify-func' => "check_poll_nv_pairs", + 'size' => 9), 'group7_end' => array ( 'type' => 'group_end', ), @@ -1629,34 +1623,34 @@ 'desc' => _("These settings do not apply to the low tech slideshow.") ), 'slideshow_type' => array( - 'prompt' => _("Slideshow Type"), - 'desc' => "
" - . "
" . _("Off") ."
" - . "
" . _("No slideshow link will appear.") . "
" - . "
" . _("Ordered") . "
" - . "
" . _("Images will display in the same order as they appear in the Gallery.") . "
" - . "
" . _("Random") . "
" - . "
" . _("Images will appear in a random order.") . "
" - . "
", - 'choices' => array( - 'off' => _("Off"), - 'ordered' => _("Ordered"), - 'random' => _("Random"), - ), - 'value' => "ordered", + 'prompt' => _("Slideshow Type"), + 'desc' => "
" + . "
" . _("Off") ."
" + . "
" . _("No slideshow link will appear.") . "
" + . "
" . _("Ordered") . "
" + . "
" . _("Images will display in the same order as they appear in the Gallery.") . "
" + . "
" . _("Random") . "
" + . "
" . _("Images will appear in a random order.") . "
" + . "
", + 'choices' => array( + 'off' => _("Off"), + 'ordered' => _("Ordered"), + 'random' => _("Random"), ), + 'value' => "ordered", + ), 'slideshow_recursive' => array( 'prompt' => _("Recursive slideshow"), 'desc' => sprintf(_("Set to %s if you want to include images in sub albums as part of the slideshow."), ""._("yes").""), 'choices' => array('yes' => _("yes"), 'no' => _("no")), 'value' => "no" - ), + ), 'slideshow_loop' => array( 'prompt' => _("Allow slideshow to loop"), 'desc' => sprintf(_("This option will allow visitors to have your slideshow repeat until they close the window or go to another page. Set it to %s if you want to save bandwidth."), ""._("no").""), 'choices' => array('yes' => _("yes"), 'no' => _("no")), 'value' => "yes" - ), + ), 'slideshow_length' => array( 'prompt' => _("Slideshow length"), 'desc' => _("Number of images to display in slideshow. Set to 0 or blank to display all images. Set to a number if slideshow is random and you want to display only a selection of the images."), @@ -1668,6 +1662,76 @@ 'group8_end' => array ( 'type' => 'group_end', ), + 'group_MicroNav_Start' => array ( + 'type' => 'group_start', + 'name' => 'group_photoMicroNav', + 'default' => 'none', + 'title' => _("Micro Thumb Photo Navigation"), + 'desc' => _("These settings apply to the micro-thumb photo navigation system. The micro thumbs are only visible when viewing individual images.") + ), + 'nav_thumbs' => array( + 'prompt' => _("Micro Thumb Photo Navigation"), + 'desc' => _("Uses micro-thumbnails for photo navigation. This creates a navigation panel with tiny thumbnails of the images around the photo you are viewing. You can also choose both to display the micro thumb navigation system AND the old style navigation system."), + 'value' => "no", + 'choices' => array('yes' => _("yes"), 'no' => _("no"), 'both' => _("both")) + ), + 'nav_thumbs_style' => array( + 'prompt' => _("Micro Thumb Photo Navigation"), + 'desc' => "
" + . "
" . _("Fixed") ."
" + . "
" . _("Displays prev+next groups of thumbs, changing only to display next group of thumbs.") . "
" + . "
" . _("Dynamic") . "
" + . "
" . _("Displays previos & next images, with current image between.") . "
" + . "
", + 'value' => "fixed", + 'choices' => array('fixed' => _("Fixed"), 'dynamic' => _("Dynamic")) + ), + 'nav_thumbs_first_last' => array( + 'prompt' => _("Show Micro Thumb for First/Last"), + 'desc' => _("This allows you to turn on and off the display of the first and last micro-thumb. Since these two images are always the same, some might find that it is not very useful and would rather display more next/previous thumbs."), + 'value' => "no", + 'choices' => array('yes' => _("yes"), 'no' => _("no")) + ), + 'nav_thumbs_prev_shown' => array( + 'prompt' => _("Number of Previous Micro Thumbs"), + 'desc' => _("This is the number of previous micro thumbs on the screen at a time. You might prefer to show fewer previous micro thumbs and more next micro thumbs."), + 'value' => "no", + 'choices' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, + 5 => 5, 6 => 6, 6 => 6, 7 => 7, + 8 => 8, 9 => 9, 10 => 10) + ), + 'nav_thumbs_next_shown' => array( + 'prompt' => _("Number of Next Micro Thumbs"), + 'desc' => _("This is the number of next micro thumbs on the screen at a time. You might prefer to show fewer previous micro thumbs and more next micro thumbs."), + 'value' => "no", + 'choices' => array(1 => 1, 2 => 2, 3 => 3, 4 => 4, + 5 => 5, 6 => 6, 6 => 6, 7 => 7, + 8 => 8, 9 => 9, 10 => 10) + ), + 'nav_thumbs_location' => array( + 'prompt' => _("Location of Micro Thumb Navigation"), + 'desc' => _("Displays the micro-thumb navigation bar at the Top, Bottom or Both of the photo viewing page. Since the micro thumb navigation system is larger than the original navigation system, you may want to display it at only the top or bottom to conserve space usage."), + 'value' => "top", + 'choices' => array( + 'top' => _("Top"), + 'both' => _("Both"), + 'bottom' => _("Bottom")) + ), + 'nav_thumbs_size' => array( + 'prompt' => _("Height of Micro Thumbs"), + 'desc' => _("The size of micro thumbnails will determine how clear the images are as well as how much room they take up. This value is the height and is in pixels. 45 is a reasonable value for viewing at 1024x768."), + 'value' => '45', + 'type' => 'text' + ), + 'nav_thumbs_current_bonus' => array( + 'prompt' => _("Bonus to Current Micro Thumb's Size"), + 'desc' => _("This is the bonus in pixels to the size of the current micro-thumb. This creates a nice look and a value of 10-15 is reasonable. Zero (0) and negative numbers (-10) are also valid here. Zero (0) will result in the current thumb being of identical size to all the other micro thumbs and a negative value will result in a smaller micro thumb."), + 'value' => '15', + 'type' => 'text' + ), + 'group_MicroNav_End' => array ( + 'type' => 'group_end', + ), 'group_frames' => array ( 'type' => 'group_start', 'name' => 'group_frames', diff -Naur gallery-1.5-pl1/setup/confirm.inc gallery-1.5.1/setup/confirm.inc --- gallery-1.5-pl1/setup/confirm.inc 2005-03-10 03:36:34.000000000 +0100 +++ gallery-1.5.1/setup/confirm.inc 2005-09-13 00:41:29.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: confirm.inc,v 1.101.2.1 2005/03/10 02:36:34 cryptographite Exp $ + * $Id: confirm.inc,v 1.104.2.1 2005/09/12 22:41:29 dmolavi Exp $ */ ?> @@ -37,7 +37,7 @@ $error = 0; $viewheader = ""; -$outfile_list=array("config.php" => false, ".htaccess" => true); +$outfile_list = array("config.php" => false, ".htaccess" => true); foreach ($outfile_list as $outfile => $optional) { if (!fs_file_exists(GALLERY_CONFDIR . "/$outfile") && !$optional) { $error++; @@ -403,6 +403,7 @@ $gallery->session->configData .= "\n"; $gallery->session->configData .= "/* Defaults */\n"; +//print_r($gallery->session->configForm); foreach ($defaults as $key => $val) { if (isset($val["type"]) && ($val["type"] == "block_start" || @@ -427,17 +428,15 @@ if (is_array($gallery->session->configForm->$key)) { foreach ($gallery->session->configForm->$key as $sub_key => $sub_value) { if (is_array ($sub_value)) { - foreach ($sub_value as $sub_sub_key - => $sub_sub_value) { - /* print_photos needs a quoted $sub_key */ - if ($key === "print_photos") { - $string="\$gallery->app->default[\"$key\"][\"$sub_key\"][\"$sub_sub_key\"] = \"$sub_sub_value\";\n"; - } else { - $string="\$gallery->app->default[\"$key\"][$sub_key][\"$sub_sub_key\"] = \"$sub_sub_value\";\n"; - } + /* Poll configuration */ + foreach ($sub_value as $sub_sub_key => $sub_sub_value) { + $string="\$gallery->app->default[\"$key\"][$sub_key][\"$sub_sub_key\"] = \"$sub_sub_value\";\n"; $gallery->session->configData .= $string; } - } + } else { + $string = "\$gallery->app->default[\"$key\"][] = \"$sub_value\";\n"; + $gallery->session->configData .= $string; + } } } else { $gallery->session->configData .= defaults($key, $gallery->session->configForm->$key); diff -Naur gallery-1.5-pl1/setup/constants.inc gallery-1.5.1/setup/constants.inc --- gallery-1.5-pl1/setup/constants.inc 2005-03-10 03:36:34.000000000 +0100 +++ gallery-1.5.1/setup/constants.inc 2005-09-13 00:41:29.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: constants.inc,v 1.43.2.2 2005/03/10 02:36:34 cryptographite Exp $ + * $Id: constants.inc,v 1.45.2.1 2005/09/12 22:41:29 dmolavi Exp $ */ ?> @@ -106,8 +106,6 @@ if (get_magic_quotes_gpc()) { $val["value"] = array_stripslashes($val["value"]); } - - } // Protect quote characters to avoid screwing up HTML forms $val["value"] = array_str_replace('"', """, $val["value"]); diff -Naur gallery-1.5-pl1/setup/diagnostics.php gallery-1.5.1/setup/diagnostics.php --- gallery-1.5-pl1/setup/diagnostics.php 2005-03-10 03:36:35.000000000 +0100 +++ gallery-1.5.1/setup/diagnostics.php 2005-09-13 00:41:29.000000000 +0200 @@ -15,15 +15,13 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: diagnostics.php,v 1.23.2.1 2005/03/10 02:36:35 cryptographite Exp $ + * $Id: diagnostics.php,v 1.24.2.2 2005/09/12 22:41:29 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/setup/frame_test.php gallery-1.5.1/setup/frame_test.php --- gallery-1.5-pl1/setup/frame_test.php 2005-03-10 03:36:35.000000000 +0100 +++ gallery-1.5.1/setup/frame_test.php 2005-09-13 00:41:29.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: frame_test.php,v 1.6.4.1 2005/03/10 02:36:35 cryptographite Exp $ + * $Id: frame_test.php,v 1.7.2.1 2005/09/12 22:41:29 dmolavi Exp $ */ ?> -*'; - } - if ($fields[3] == "block_element") { - $buf .= "\n
$f0".$fields[1]."
"; - $buf .= "\n"; - $buf .= "\n\t"; - $buf .= "\n
$f0

"; - $buf .= "\n\t".$fields[2]."

"; - } else if ($fields[3] == "block_end") { - $buf .= "\n
$f0$fields[1]
$fields[2]
" - . "" - . "" - . "" - . ""; - foreach ($arr["value"] as $result) { - $name=$result["name"]; - $value=$result["value"]; - $buf .= '' - . '\n"; - $buf .= '" - . "\n"; - $x++; - if ($x >= $arr["size"]) { - break; - } - } - for (; $x<$arr["size"]; $x++) { - $buf .= '\n"; - $buf .= '\n"; - } - $buf.="
". _("Name") . "". _("Value") ."
"; - return $buf; -} - -function form_choice($key, $arr) { - - $buf = "\n\t\n"; - return $buf; -} - -function form_multiple_choice($key, $arr) { - - $buf= '\n"; - if (isset($arr['multiple_choices']['addon'])) { - $buf .="\n"; - } - $buf .="
'; - $count=0; - $column=0; - foreach ($arr["multiple_choices"] as $item => $value) { - if ($item == 'addon') continue; - if ($count%15 ==0) { - $buf .= ""; - } - $count++; - $column++; - $selected = ""; - if (is_array($arr["value"]) && in_array($item, $arr["value"])) { - $selected = "CHECKED"; - } - $buf .= "\n\t
" . $value ; - } - $buf .="
++". $arr['multiple_choices']['addon'] . "\n++
"; - return $buf; -} - -function form_print_services($key, $arr) { - - $buf= "\n\t"; - foreach ($arr['services'] as $item => $data) { - if (isset($arr['value'][$item])) { - if (is_array($arr['value'][$item])) { - $value = $arr['value'][$item]; - if (!isset($value['checked'])) { - $value['checked'] = false; - } - } else { - $value = array('checked' => true); - } - } else { - $value = array('checked' => false); - } - $checked = $value['checked'] ? ' checked' : ''; - $buf .= "\n\t\t"; - } - $buf .="\n\t
\n\t\t\t${data['name']}"; - if (!empty($data['desc'])) { - $buf .= ' - ' . $data['desc']; - } - $buf .= "\n\t\t
\n\t"; - return $buf; -} - -function getPath() { - - /* Start with the server user's path */ - $path = explode(":", getenv("PATH")); - - /* Add in a few relatively obvious locations */ - $path[] = "/usr/local/gallery"; - $path[] = "/usr/local/gallery/bin"; - $path[] = "/usr/local/gallery/jhead"; - $path[] = "/usr/local/gallery/netpbm"; - $path[] = "/usr/local/bin"; - $path[] = "/usr/local/bin/jhead"; - $path[] = "/usr/local/bin/netpbm"; - $path[] = "/usr/local/netpbm"; - $path[] = "/usr/local/netpbm/bin"; - $path[] = "/usr/local/jhead"; - $path[] = "/usr/local/jhead/bin"; - $path[] = "/usr/bin/gallery"; - $path[] = "/usr/bin/gallery/jhead"; - $path[] = "/usr/bin/gallery/netpbm"; - $path[] = GALLERY_BASE . "/netpbm"; - $path[] = GALLERY_BASE . "/bin"; - $path[] = GALLERY_BASE . "/bin/netpbm"; - $path[] = GALLERY_BASE . "/bin/jhead"; - - return $path; -} - -function locateDir($filename, $extraDir="", $ignorePath=0) { - - if (fs_file_exists("$extraDir/$filename")) { - return $extraDir; - } - - if ($ignorePath) { - return; - } - - foreach (getPath() as $path) { - if (fs_file_exists("$path/$filename") && !empty($path)) { - return $path; - } - } -} - -function locateFile($filename) { - foreach (getPath() as $path) { - if (fs_file_exists("$path/$filename") && !empty($path)) { - return "$path/$filename"; - } - } -} - -function one_constant($key, $value) { - return "\$gallery->app->$key = \"{$value}\";\n"; -} - -function array_constant($key, $value) { - $buf=""; - foreach ($value as $item) { - $buf .= "\$gallery->app->${key}[] = \"{$item}\";\n"; - } - return $buf; -} - -function defaults($key, $value) { - return "\$gallery->app->default[\"$key\"] = \"$value\";\n"; -} - -function use_feature($feature) { - return "\$gallery->app->feature[\"$feature\"] = 1;\n"; -} - -function no_feature($feature, $cause) { - return "\$gallery->app->feature[\"$feature\"] = 0; // ($cause)\n"; -} - -function error_missing($desc, $key) { - if (empty($desc)) { - $desc=$key; - } - return gallery_error("// " . _("Missing value") . ": $desc!"); -} - -function error_row_wrap($buf) { - return "// $buf"; -} - -function check_exec() { - $disabled = "" . ini_get("disable_functions"); - - $success = array(); - $fail = array(); - $warn = array(); - if (!empty($disabled)) { - foreach(explode(',', $disabled) as $disabled_func) { - if(eregi('^exec$', $disabled_func)) { - $fail["fail-exec"] = 1; - } - } - } - - if (empty($fail['fail-exec'])) { - $success[] = _("exec() is not disabled on this server."); - } - - return array($success, $fail, $warn); -} - -function check_htaccess() { - global $GALLERY_PHP_VALUE_OK; - - /* - * the .htaccess file in the parent directory tries to - * auto_prepend the got-htaccess.php file. If that worked, - * then GALLERY_PHP_VALUE_OK will be set. - */ - $success = array(); - $fail = array(); - $warn = array(); - if ($GALLERY_PHP_VALUE_OK) { - $success[] = _("I can read your .htaccess file."); - } else { - $fail["fail-htaccess"] = 1; - } - - return array($success, $fail, $warn); -} - -function check_php() { - global $MIN_PHP_MAJOR_VERSION; - - $version = phpversion(); - $success = array(); - $fail = array(); - $warn = array(); - - if (!function_exists('version_compare') || !version_compare($version, "4.1.0", ">=")) { - $fail['fail-too-old'] = 1; - } else { - $success[] = sprintf(_("PHP v%s is OK."), $version); - } - - return array($success, $fail, $warn); -} -function check_mod_rewrite() { - global $GALLERY_REWRITE_OK; - - $success = array(); - $fail = array(); - $warn = array(); - if ($GALLERY_REWRITE_OK) { - $success[] = _("mod_rewrite is enabled."); - } else { - $fail["fail-mod-rewrite"] = 1; - } - - return array($success, $fail, $warn); -} - -function check_exif($location="") { - global $gallery; - - $fail = array(); - $success = array(); - $warn = array(); - - $bin = fs_executable("jhead"); - - if ($location) { - $d = locateDir($bin, $location); - } else { - $d = locateDir($bin, isset($gallery->app->use_exif) ? dirname($gallery->app->use_exif) : ""); - } - if (!$d) { - $warn["fail-exif"] = _("Can't find jhead"); - } else { - $success[] = _("jhead binary located."); - } - - return array($success, $fail, $warn); -} - -function check_graphics($location="", $graphtool = "") { - global $gallery; - - $fail = array(); - $success = array(); - $warn = array(); - if (!strcmp($graphtool, "ImageMagick")) { - $success[] = _("NetPBM not being used in this installation."); - return array($success, $fail, $warn); - } - - if (!empty($location) && !inOpenBasedir($location)) { - $success[] = _("Cannot verify this path (it's not in your open_basedir list)."); - return array($success, $fail, $warn); - } - - $dirs = array(); - $missing = array(); - $netpbm = array( - fs_executable("jpegtopnm"), - fs_executable("giftopnm"), - fs_executable("pngtopnm"), - fs_executable("pnmtojpeg"), - fs_executable("ppmtogif"), - fs_executable("pnmtopng"), - fs_executable("pnmscale"), - fs_executable("pnmfile"), - fs_executable("ppmquant"), - fs_executable("pnmcut"), - fs_executable("pnmrotate"), - fs_executable("pnmflip"), - fs_executable("pnmcomp"), - ); - - $fallback = array( - fs_executable("pnmtojpeg") => fs_executable("ppmtojpeg"), - fs_executable("pnmcomp") => fs_executable("pamcomp") - ); - - $optional = array( - fs_executable("pnmcomp") => - _("Without pnmcomp and pamcomp gallery will not be able to watermark images, unless you use ImageMagick and have the composite binary installed."), - ); - $missing_optional = 0; - - foreach ($netpbm as $bin) { - if ($location) { - $d = locateDir($bin, $location, 1); - } else { - $d = locateDir($bin, isset($gallery->app->pnmDir) ? $gallery->app->pnmDir : ""); - } - - /* - * If we can't find the primary file, look for the fallback file - * instead. - */ - if (!$d && isset($fallback[$bin])) { - $newbin = $fallback[$bin]; - if ($location) { - $d = locateDir($newbin, $location, 1); - } else { - $d = locateDir($newbin, isset($gallery->app->pnmDir) ? $gallery->app->pnmDir : ""); - } - if ($d) { - $bin = $newbin; - } - } - - if (!$d && isset($optional[$bin])) { - $warn[$bin] = sprintf(_("Missing optional binary %s. %s"), $bin, $optional[$bin]); - $missing_optional++; - } else { - if (!$d) { - $missing[$bin] = sprintf(_("Can't find %s!"), "$bin"); - } - - if (!empty($d) && inOpenBasedir($d)) { - if (!fs_is_executable("$d/$bin")) { - $missing[$bin] = sprintf(_("%s is not executable!"), - "$bin "); - } - } - } - } - - if ($missing_optional) { - // $warn[] is already set - $warn[] = sprintf(_("%d of %d NetPBM binaries located."), - count($netpbm) - $missing_optional, count($netpbm) ); - } else if (count($missing) == count($netpbm)) { - $fail["fail-netpbm"] = 1; - } else if (count($missing)) { - $fail["fail-netpbm-partial"] = array_values($missing); - } else { - $success[] = sprintf(_("%d of %d NetPBM binaries located."), - count($netpbm), count($netpbm) ); - } - - return array($success, $fail, $warn); -} - -function check_graphics_im($location="", $graphtool="") { - global $gallery; - - $fail = array(); - $success = array(); - $warn = array(); - - if (!strcmp($graphtool, "NetPBM")) { - $success[] = _("ImageMagick not being used in this installation."); - return array($success, $fail); - } - - if (!empty($location) && !inOpenBasedir($location)) { - $success[] = _("Cannot verify this path (it's not in your open_basedir list)."); - return array($success, $fail); - } - - $dirs = array(); - $missing = array(); - $imagick = array( - fs_executable("identify"), - fs_executable("convert"), - fs_executable("composite"), - ); - - $optional = array( - fs_executable("composite") => - _("Without composite gallery will not be able to watermark images, except you use NetPBM and have the pnmcomp binary installed."), - ); - $missing_optional = 0; - - foreach ($imagick as $bin) { - if ($location) { - $d = locateDir($bin, $location, 1); - } else { - $d = locateDir($bin, isset($gallery->app->ImPath) ? $gallery->app->ImPath : ""); - } - - if (!$d) { - if ($optional[$bin]) { - $warn[$bin] = sprintf(_("Missing optional binary %s. %s"), $bin, $optional[$bin]); - $missing_optional++; - } else { - $missing[$bin] = sprintf(_("Can't find %s!"), "$bin"); - } - } - - if (!empty($d) && inOpenBasedir($d)) { - if (!fs_is_executable("$d/$bin")) { - $missing[$bin] = sprintf(_("%s is not executable!"), - "$bin "); - } - } - } - - if ($missing_optional) { - $warn[] = sprintf(_("%d of %d ImageMagick binaries located."), - count($imagick) - $missing_optional, count($imagick)); - } else if (count($missing) == count($imagick)) { - $fail["fail-imagemagick"] = 1; - } else if (count($missing)) { - $fail["fail-imagemagick"] = array_values($missing); - } else { - $success[] = sprintf(_("%d of %d ImageMagick binaries located."), - count($imagick), count($imagick)); - } - - return array($success, $fail, $warn); -} - -function check_jpegtran($location="") { - global $gallery; - - $fail = array(); - $success = array(); - $warn = array(); - - $bin = fs_executable("jpegtran"); - - if ($location) { - $d = locateDir($bin, $location); - } else { - $d = locateDir($bin, isset($gallery->app->use_jpegtran) ? dirname($gallery->app->use_jpegtran) : ""); - } - if (!$d) { - $warn["fail-jpegtran"] = _("Can't find jpegtran!"); - } else { - $success[] = _("jpegtran binary located."); - } - - return array($success, $fail, $warn); -} - -function check_gettext() { - $fail = array(); - $success = array(); - $warn = array(); - if (gettext_installed()) { - $success[] = _("PHP has GNU gettext support."); - } else { - $warn["fail-gettext"] = _("PHP does not have GNU gettext support."); - } - return array($success, $fail, $warn); -} - -function check_gallery_languages() { - global $gallery; - $fail = array(); - $success = array(); - $warn = array(); - $nls = getNLS(); - - $languages=gallery_languages(); - if (sizeof($languages) == 0) { - $fail["fail-gallery-languages"] = _("No languages found."); // should never occur! - } else if (sizeof($languages) == 1 ) { - $warn['only_english'] = _("It seems you didn't download any additional languages. This is not a problem! Gallery will appear just in English. Note: If this is not true, check that all files in locale folder are readable for the webserver, or contact the Gallery Team."); - } - else { - $success[] = sprintf(_("%d languages are available. If you are missing a language please visit the %sGallery download page%s."), - sizeof($languages), - "url\">", - ''); - } - return array($success, $fail, $warn); -} - -function check_gallery_version() { - global $gallery; - $fail = array(); - $success = array(); - $warn = array(); - - /* how many days old is the gallery version? */ - $age = (time() - $gallery->last_change)/86400; - - /* is this a beta or RC version? */ - $beta = ereg('-(b|RC)[0-9]*$', $gallery->version); - - $link="url\">$gallery->url"; - - $visit=sprintf(_("You can check for more recent versions by visiting %s."), - $link); - $this_version = sprintf(_("This version of %s was released on %s."), - Gallery(), strftime("%x", $gallery->last_change)); - $this_beta_version = sprintf(_("This is a development build of %s that was released on %s."), - Gallery(), strftime("%x", $gallery->last_change)); - - if ($age > 180) { - $fail["too_old"] = "$this_version $visit"; - } else if ($age > 14 && $beta) { - $fail["too_old"] = "$this_beta_version $visit"; - } else if ($beta) { - $success["ok"] = "$this_beta_version $visit" . " " - . _("Please check regularly for updates."); - } else { - $success["ok"] = "$this_version $visit"; - } - return array($success, $fail, $warn); -} - -function check_absent_locales() { - global $locale_check; - $fail = array(); - $success = array(); - $warn = array(); - $msg = ''; - - $available = $locale_check["available_locales"]; - $maybe = $locale_check["maybe_locales"]; - $unavailable = $locale_check["unavailable_locales"]; - - if($locale_check != NULL && sizeof($unavailable) ==0) { - $success[] = _("All gallery locales are available on this host."); - } else if( (sizeof($maybe) + sizeof($unavailable)) > 0) { - if (sizeof($maybe) > 0) { - $msg = sprintf(_("There are %d locales that Gallery was unable to locate. You may need to select manually date formats. "),sizeof($maybe)); - } - - if (sizeof($unavailable) > 0) { - if(sizeof($maybe) > 0) $msg .= "

"; - - $msg .= sprintf(_("Dates in %d languages may not be formatted properly, because the corresponding locales are missing. You may need to select manually the date formats for these."),sizeof($unavailable)); - } - $warn[] = $msg; - } else { - if (ini_get('open_basedir') && getOS() != OS_LINUX) { - $warn[] = sprintf(_("We were unable to detect any locales. However, your PHP installation is configured with the %s restriction so this may be interfering with the way that we detect locales. Unfortunately this means the date format will not change for different languages. However, it is OK to continue."), - 'open_basedir'); - } else { - if (getOS() == OS_LINUX) { - $fail[] = sprintf(_("We were unable to detect any system locales. Multi-language functions will be disabled. Please install the corresponding locales or ask your administrator to do this. This problem is known on %s systems. In this case please have a look at this %sDebian locale HowTo%s."),"Debian", '', ""); - } else { - $warn[] = _("Only the default locale for this machine is available, so date format will not change for different languages."); - } - } - } - return array($success, $fail, $warn); -} - -function check_locale() { - $nls = getNLS(); - $gallery_languages = array_keys(gallery_languages()); - $system_locales = array(); - - $available_locales = array(); - $maybe_locales = array(); - $unavailable_locales = array(); - - /* Lets see which system locales are installed. */ - if (getOS() != OS_WINDOWS) { - # Unix / Linux - # Check which locales are installed - - exec("locale -a", $results, $status); - - if(count($results) >2) { - $system_locales = $results; - } elseif (@is_readable("/etc/locale.gen")) { - exec('grep -v -e "^#" /etc/locale.gen | cut -d " " -f 1', $system_locales); - } elseif (@is_readable("/usr/share/locale")) { - exec("ls /usr/share/locale", $system_locales); - } elseif (@is_readable("/usr/local/share/locale")) { - exec("ls /usr/local/share/locale", $system_locales); - } - } - - /* DAMN, there are none we use Linux and our PHP uses gettext*/ - if( sizeof($system_locales) == 0 && getOS() == OS_LINUX && gettext_installed()) { - return NULL; - } - - /* There were at least one system locale - ** Now lets test if our languages are supported by the system - */ - foreach ($gallery_languages as $locale) { - $aliases=array(); - - /* Found an supported one, put it in availables */ - if ( (in_array($locale, $system_locales)) || (setlocale(LC_ALL, $locale))) { - $available_locales[$locale]=$locale; - continue; - } - - /* - ** First, we try using the full lang, (first 5 chars) if - ** that doesn't match then - ** we use the first 2 letter to build an alias list - ** e.g. nl to find nl_BE or nl_NL - */ - if (in_array($locale,$nls['alias'])) { - $keylist = array_keys($nls['alias'],$locale); - $aliases = $keylist; - if (getOS() != OS_WINDOWS) { - $sub='^(' . implode('|', $keylist) . '|' . substr($locale,0,5) . ')'; - foreach ($system_locales as $key => $value) { - if (ereg($sub, $value)) { - $aliases[] = $value; - } - elseif (ereg('^' . substr($locale,0,2),$value)) { - $aliases[] = $value; - } - } - } - } else { - foreach ($system_locales as $key => $value) { - if (ereg('^' . substr($locale,0,2), $value)) { - $aliases[] = $value; - } - } - } - - $aliases=array_unique($aliases); - $noway=Array ('zh_TW.eucTW'); - if ($aliases) { - foreach ($aliases as $test) { - // We do this because all locales in $noway seem to crash at least some NetBSD - // Maybe changed in future - if (!in_array($test,$noway)) { - if (setlocale(LC_ALL,$test)) { - $maybe_locales[$locale][]=$test; - } - } - } - if (! isset($maybe_locales[$locale])) { - $unavailable_locales[] = $locale; - } - } else { - $unavailable_locales[]=$locale; - } - } - - - // Set locale correct back - if (isset($gallery->locale)) { - setlocale(LC_ALL,$gallery->locale); - } else { - setlocale(LC_ALL,""); - } - - /* DAMN, there are no suitable locales, we use Linux and our PHP uses gettext*/ - if( sizeof($available_locales) == 0 && sizeof($maybe_locales) == 0 && getOS() == OS_LINUX && gettext_installed()) { - return NULL; - } - - return array( - "available_locales" => $available_locales, - "maybe_locales" => $maybe_locales, - "unavailable_locales" => $unavailable_locales - ); -} - - -function config_maybe_locales() { - global $locale_check, $locales; - - $results = array(); - $locales = $locale_check; - $available = $locales["available_locales"]; - $maybe = $locales["maybe_locales"]; - $unavailable = $locales["unavailable_locales"]; - - // If we are in Linux, our PHP has gettext, - // but we could not find any locale we skip the whole aliasing part. - if($locales == NULL) return $results; // blank array - - $nls = getNLS(); - - $block_start_done = false; - - $nr=0; - foreach ($maybe as $key => $aliases) { - if (sizeof($aliases) < 1) { - $unavailable[]=$key; - continue; - } -/* - if (sizeof($aliases) == 1) { - $results["locale_alias['$key']"] = array ( - "type" => "hidden", - "value" => array_pop($aliases), - "desc" => "locale_alias[$key]", - "prompt" => "locale_alias[$key]" - ); - continue; - } -*/ - $nr++; - if (!$block_start_done) { - $block_start_done=true; - $results[] = array ( - "type" => "block_start", - "prompt" => "(" . _("Advanced") . ")
".sprintf(_("System locale selection required")), - "desc" => _("There is more than one suitable system locale installed on your machine for the following languages. Please chose the one you think is most suitable.") . - "

" . - _("This is only for date & time format. You only need to edit the languages you enabled above") - ); - } - $index = $nls['language'][$key] ; - - $choices=array(); - - foreach ($aliases as $value) { - $choices[$value]=$value; - } - if (getOS() != OS_WINDOWS) { - $choices[""] = _("System locale"); - next($choices); - } - $results["locale_alias['$key']"] = array ( - "prompt" => $nr .".) ". $nls['language'][$key], - "optional" => 1, - "name" => "locale_alias", - "key" => $key, - "type" => "block_element", - "choices" => $choices, - "value" => (getOS() != OS_WINDOWS) ? key($choices) : "", - "allow_empty" => true, - "remove_empty" => true - ); - - - } - - if ($block_start_done) { - $results[] = array ("type" => "block_end"); - } - $block_start_done=false; - - $choices=array(); - if (getOS() != OS_WINDOWS) $choices=array("" => _("System locale")); - if (sizeof($available) > 0) { - foreach ($available as $choice => $value) { - $choices[$choice]=$nls['language'][$value]; - } - - $avail_keys=array_keys($available); - } elseif (sizeof($maybe) > 0) { - foreach ($maybe as $key => $aliases) { - foreach ($aliases as $choice) { - $choices[$choice]=$choice; - } - } - - $avail_keys=array_keys($choices); - } else { - if (getOS() == OS_OTHER) { - $array_keys=$choices; - } else { - $skip=true; - } - } - - if (! isset ($skip)) { - $avail_keys=array_keys($choices); - foreach ($unavailable as $key) { - if (sizeof($choices) == 1) { - $results["locale_alias['$key']"] = array ( - "type" => "hidden", - "value" => $avail_keys[0], - "desc" => "locale_alias[$key]", - "prompt" => "locale_alias[$key]", - "allow_empty" => true, - "remove_empty" => true - ); - continue; - } - - if (!$block_start_done) { - $block_start_done=true; - $results[] = array ( - "type" => "block_start", - "prompt" => "(" . _("Advanced") . ")
".sprintf(_("System locale problems")), - "desc" => _("There are no apparently suitable system locales installed on your machine for the following languages. Please choose the one you think is most suitable.") . - "

" . - _("This is only for date & time format. You only need to edit the languages you enabled above") - ); - } - $index = $nls['language'][$key] ; - $results["locale_alias['$key']"] = array ( - "prompt" => $nls['language'][$key], - "name" => "locale_alias", - "key" => $key, - "type" => "block_element", - "choices" => $choices, - "value" => "", - "allow_empty" => true, - "remove_empty" => true - ); - } - if ($block_start_done) { - $results[] = array ("type" => "block_end"); - } - } - return $results; -} - -function default_graphics() { - list ($imageMagick,) = check_graphics_im(); - - if (count ($imageMagick)) { - return "ImageMagick"; - } else { - return "NetPBM"; - } -} - -function check_safe_mode() { - $fail = array(); - $success = array(); - $warn = array(); - $safe_mode = ini_get("safe_mode"); - if (empty($safe_mode) || - !strcasecmp($safe_mode, "off") || - !strcasecmp($safe_mode, "0") || - !strcasecmp($safe_mode, "false")) { - $success[] = _("safe_mode is off."); - } else { - $fail["fail-safe-mode"] = 1; - } - return array($success, $fail,$warn); -} - -function check_magic_quotes() { - $fail = array(); - $success = array(); - $warn = array(); - if (!get_magic_quotes_gpc()) { - $success[] = _("magic_quotes are off."); - } else { - $fail["fail-magic-quotes"] = 1; - } - - return array($success, $fail, $warn); -} - -function check_poll_nv_pairs($var) { - $fail = array(); - $success = array(); - $finished = false; - $rownum=0; - foreach ($var as $element) { - $rownum++; - if (!$element["name"]) { - $finished=true; - if ($element["value"]) { - $fail[]=sprintf(_("In %s, missing %s in row %d with %s %s."), - _("Vote words and values"), - _("Name"), $rownum, _("Value"), - $element["value"]); - break; - } - continue; - } else { - if ($finished) { - $fail[]=sprintf(_("In %s, blank in row %d."), - _("Vote words and values"), - $rownum-1); - break; - } else if (!ereg("^[1-9][0-9]*$", $element["value"])) { - $fail[]=sprintf(_("In %s, for name %s (row %d) value %s should be a positive whole number"), - _("Vote words and values"), - $element["name"], - $rownum, $element["value"]); - break; - } - } - } - return array($success, $fail); -} - -function check_register_globals() { - $fail = array(); - $success = array(); - $warn = array(); - - $globals_enabled = ini_get('register_globals'); - - if (!empty($globals_enabled) && !eregi('no|off|false', $globals_enabled)) { - $fail['warn-register_globals'] = 1; - } - else { - $success[] = _("register_globals is off."); - } - - return array($success, $fail, $warn); -} - -function detect_exec_status() { - global $gallery; - - if (isset($gallery->app) && isset($gallery->app->expectedExecStatus)) { - return $gallery->app->expectedExecStatus; - } - - // If PHP is compiled with the --enable-sigchild option, then every - // exec() call returns an error status of -1. WTF?!?! Sigh. So - // Let's do some checking on some pretty standard programs and see - // what they return. - $progs = array( - "ls", - "echo", - "hostname", - "pwd", - "df", - "ps", - "sync", - ); - - $count = array(); - foreach ($progs as $prog) { - $dir = locateDir($prog); - if ($dir) { - $file = "$dir/$prog"; - if (fs_is_executable($file)) { - fs_exec($file, $results, $status); - if (isset($count[$status])) { - $count[$status]++; - } else { - $count[$status]=1; - } - } - } - } - - if (count($count) == 0) { - // Nothing! :-( Hope for the best. - return 0; - } else { - // Return the one that we see the most of. - $max = -1; - foreach ($count as $key => $val) { - if ($val > $max) { - $status = $key; - $max = $val; - } - } - } - - return $status; -} - -/* - * Actually try to write to a file inside the directory. This detects - * open_basedir restrictions. - */ -function test_write_to_dir($dir) { - $tmpfile = tempnam($dir, "dbg"); - if ($fd = fs_fopen($tmpfile, "w")) { - fclose($fd); - unlink($tmpfile); - return 1; - } - - return 0; -} - -function inOpenBasedir($dir) { - $openBasedir = ini_get('open_basedir'); - if (empty($openBasedir)) { - return true; - } - - /* - * XXX: this is not perfect. For example, if the open_basedir list - * contains "/usr/localx" this code will match "/usr/local". Let's not - * worry too much about that now. - */ - foreach (explode(':', $openBasedir) as $basedir) { - if (!strncmp($basedir, $dir, strlen($basedir))) { - return true; - } - } - - return false; -} - -function make_separator($key, $arr) { - $buf ="\n
"; - $buf .= "\n\t
". $arr["title"] ."
"; - if( isset($arr["desc"])) { - $buf .= "\n
". $arr["desc"] ."
"; - } - $buf .="\n
"; - return $buf; -} - -function array_stripslashes($subject) { - if (is_string($subject)) { - return stripslashes($subject); - } - if (!is_array($subject)) { - return ($subject); - } - $ret=array(); - foreach ($subject as $key => $value) { - $ret[$key]=array_stripslashes($value); - } - return $ret; -} - -/* -** Check if Magic Quotes are On -** If yes stripslashes and return the cleaned input. -** -** Jens Tkotz, 02/2004 -*/ -function stripWQuotesON($mixed) { - if (get_magic_quotes_gpc()) { - return array_stripslashes($mixed); - } - else { - return $mixed; - } - -} - -function array_urldecode($subject) { - if (is_string($subject)) { - return urldecode($subject); - } - if (!is_array($subject)) { - return ($subject); - } - $ret=array(); - foreach ($subject as $key => $value) { - $ret[$key]=array_urldecode($value); - } - return $ret; -} -function array_str_replace($search, $replace, $subject) { - if (is_string($subject)) { - return str_replace($search, $replace, $subject); - } - if (!is_array($subject)) { - return ($subject); - } - $ret=array(); - foreach ($subject as $key => $value) { - $ret[$key]=array_str_replace($search, $replace, $value); - } - return $ret; -} - -function verify_password($passwords) { - $success = array(); - $fail = array(); - if ($passwords[2] === $passwords[3]) { - $success[] = true; - } else { - $fail[] = _('Your passwords do not match!'); - } - return array($success, $fail); -} - -function verify_email($emailMaster) { - global $gallery; - - $fail = array(); - $success = array(); - if ($emailMaster == "no") { - $success[] = _("OK"); - return array($success, $fail); - } - - if (gallery_validate_email($gallery->session->configForm->adminEmail)) { - $success[] = _("Valid admin email address given."); - } else { - $adminEmail = ereg_replace('([[:space:]]+)', '', $gallery->session->configForm->adminEmail); - $emails = array_filter1(explode(',', $gallery->session->configForm->adminEmail)); - $size = sizeof($emails); - - if ($size < 1) { - $fail[]= _("You must specify valid admin email addresses"); - } else { - $adminEmail=""; - $join=""; - foreach ($emails as $email) { - $adminEmail .= "$join$email"; - $join=","; - if (! gallery_validate_email($email)) { - $fail[] = sprintf(_("%s is not a valid email address."), - $email); - } else { - $success[] = "Valid admin email given."; - } - } - } - } - if (gallery_validate_email($gallery->session->configForm->senderEmail)) { - $success[] = _("Valid sender email address given."); - } else { - $fail[]= _("You must specify a valid sender email address"); - } - if (!empty($gallery->session->configForm->emailGreeting) && !strstr($gallery->session->configForm->emailGreeting, "!!USERNAME!!")) { - $fail[]= sprintf(_("You must include %s in your welcome email"), "!!USERNAME!!"); - } - if (!empty($emailGreeting) && - !strstr($gallery->session->configForm->emailGreeting, "!!PASSWORD!!" ) && - !strstr($gallery->session->configForm->emailGreeting, "!!NEWPASSWORDLINK!!" )) { - $fail[]= sprintf(_("You must include %s or %s in your welcome email"), - "!!PASSWORD!!", - "!!NEWPASSWORDLINK!!"); - } - return array($success, $fail); -} - -function check_ecards($num) { - if ($num < 15 || $num > 365) { - $fail = array(); - $fail["fail-ecardPrune"]++; - } else { - $success = array(); - $success[] = "Valid value specified."; - } - return array($success, $fail); -} - -function check_gallery_versions() { - $fail = array(); - $success = array(); - $warn = array(); - list($oks, $errors, $warnings) = checkVersions(false); - if ($errors) { - $fail[]=sprintf(_("The following files are out of date, corrupted or missing:
    %s."), - implode('
    ', array_keys($errors))). "

" . - "
" . _("This should be fixed before proceeding") . - "
" . sprintf(_("Look at %sCheck Versions%s for more details."), - "", ""); - } else if ($warnings) { - $warn[]=sprintf(_("%d files are more recent than expected. This is OK if you are using pre-release, beta, CVS or modified code."), count($warnings)) . - "
" . sprintf(_("Look at %sCheck Versions%s for more details."), - "", ""); - } else { - if (count($oks) == 0) { - $success[] = sprintf(_("All tested files up-to-date.")); - } else { - $success[]=sprintf(_("All %d tested files up-to-date."), count($oks)); - } - } - return array($success, $fail, $warn); -} - - -function newIn($version) { - $buf = "\n\t
("; - $buf .= sprintf(_("this is new in version %s"), $version); - $buf .= ")"; - return $buf; -} -function returnToConfig() { - $buf = sprintf(_("Return to %s."), '' . - _("Configuration Wizard") . ''); - return $buf; -} -if (!function_exists('array_filter1')) { - function array_filter1($input, $function=NULL) { - $output=array(); - foreach ($input as $name => $value) { - if ($function && $function($value)) { - $output[$name]=$value; - } else if ($value) { - $output[$name]=$value; - } - } - return $output; - } -} - -function check_admins() { - - global $gallery; - - $admins=array(); - - if (isset($gallery->app->userDir) && fs_is_dir($gallery->app->userDir)) { - require_once(GALLERY_BASE . '/classes/User.php'); - require_once(GALLERY_BASE . '/classes/EverybodyUser.php'); - require_once(GALLERY_BASE . '/classes/NobodyUser.php'); - require_once(GALLERY_BASE . '/classes/LoggedInUser.php'); - require_once(GALLERY_BASE . '/classes/UserDB.php'); - require_once(GALLERY_BASE . '/classes/gallery/UserDB.php'); - require_once(GALLERY_BASE . '/classes/gallery/User.php'); - - - $userDB = new Gallery_UserDB(); - - $admins=array(); - if (isset($userDB)) { - foreach ($userDB->getUidList() as $uid) { - $tmpUser = $userDB->getUserByUid($uid, true); - - if ($tmpUser->isAdmin()) { - $admins[]=$tmpUser->getUsername(); - } - } - } - } - - if (empty($admins)) { - $result=array( - 'desc' => sprintf(_('You must enter a password for the %s account.'), 'admin') - ); - } - else if (! in_array("admin",$admins)) { - if (sizeof($admins) == 1) { - $desc_text=sprintf(_("It seems you've already configured Gallery, because there is one admin account, but its not called %s."), 'admin'); - } - else { - $desc_text=sprintf(_("It seems you've already configured Gallery, because there are %d admin accounts, but no user called %s."), sizeof($admins), 'admin'); - } - $desc_text .= " " . sprintf (_("You don't have to enter a password. But if you do, Gallery will create an administrator account called %s with that password."), 'admin'); - $result=array( - "desc" => $desc_text, - "optional" => 1, - "remove_empty" => true - ); - } - else { - $result=array( - "desc" => sprintf(_("It seems you've already configured Gallery, because the %s user exists. You don't have to enter a password. But if you do, Gallery will change the password for the %s user."), 'admin', 'admin'), - "optional" => 1, - "remove_empty" => true - ); - } - - $result = array_merge($result,array( - "prompt" => _("Admin password"), - "type" => "password", - "dont-write" => 1, - 'verify-func' => 'verify_password', - "value" => "", - "attrs" => array("size" => 20), - "required" => true, - )); - - return $result; -} - -function displayNameOptions() { - return array ( - "!!FULLNAME!! (!!USERNAME!!)" => - sprintf("%s (%s)", _("Full Name"), _("Username")), - "!!USERNAME!! (!!FULLNAME!!)" => - sprintf("%s (%s)", _("Username"), _("Full Name")), - "!!FULLNAME!!" => - _("Full Name"), - "!!USERNAME!!" => - _("Username"), - "!!MAILTO_FULLNAME!!" => - _("Full name that you can click on to send email (mailto:)"), - "!!MAILTO_USERNAME!!" => - _("Username that you can click on to send email (mailto:)"), - "!!FULLNAME!! (!!EMAIL!!)" => - sprintf("%s (%s)", _("Full Name"), _("email address")), - "!!USERNAME!! (!!EMAIL!!)" => - sprintf("%s (%s)", _("Username"), _("email address")), - ); -} - -function check_filedirective() { - $success = array(); - $fail = array(); - $warn = array(); - - if (strstr(__FILE__, 'setup/functions.inc') || - strstr(__FILE__, 'setup\\functions.inc')) { - $success[]=_("Your version of PHP handles this issue properly."); - } else { - $fail['buggy__FILE__'] = 1; - } - - return array($success, $fail, $warn); -} - -function checkVersions($verbose=false) { - global $gallery; - /* we assume setup/init.php was loaded ! */ - - $manifest=GALLERY_BASE . '/manifest.inc'; - $success=array(); - $fail=array(); - $warn=array(); - if (!fs_file_exists($manifest)) { - $fail["manifest.inc"]=_("File missing or unreadable. Please install then re-run this test."); - return array($success, $fail, $warn); - } - if (!function_exists('getCVSVersion')) { - $fail['util.php']=sprintf(_("Please ensure that %s is the latest version."), "util.php"); - return array($success, $fail, $warn); - } - include (GALLERY_BASE . '/manifest.inc'); - if ($verbose) { - print sprintf(_("Testing status of %d files."), count($versions)); - } - foreach ($versions as $file => $version) { - $found_version=getCVSVersion($file); - if ($found_version === NULL) { - if ($verbose) { - print "
\n"; - print sprintf(_("Cannot read file %s."), $file); - } - $fail[$file]=_("File missing or unreadable."); - continue; - } else if ($found_version === "") { - if ($verbose) { - print "
\n"; - print sprintf(_("Version information not found in %s. File must be old version or corrupted."), $file); - } - $fail[$file]=_("Missing version"); - continue; - } - $compare=compareVersions($version, $found_version); - if ($compare < 0) { - if ($verbose) { - print "
\n"; - print sprintf(_("Problem with %s. Expected version %s (or greater) but found %s."), $file, $version, $found_version); - } - $fail[$file]=sprintf(_("Expected version %s (or greater) but found %s."), $version, $found_version); - } else if ($compare > 0) { - if ($verbose) { - print "
\n"; - print sprintf(_("%s OK. Actual version (%s) more recent than expected version (%s)"), $file, $found_version, $version); - } - $warn[$file]=sprintf(_("Expected version %s but found %s."), $version, $found_version); - } else { - if ($verbose) { - print "
\n"; - print sprintf(_("%s OK"), $file); - } - $success[$file]=sprintf(_("Found expected version %s."), $version); - } - - } - return array($success, $fail, $warn); -} - -/* -** This function creates a table with tabs for navigating through Config Sections (Groups). -** -** It analyses a given Array which is in config_data Style: -** -** "" => array ( -** "type" => -** "name" => -** "default" => -** "title" => -** "desc" => -** ) -** -** "type" : Indicates that a group starts or ends. Possible values: 'group_start' , 'group_end'. -** "name" : To identify the group you have to set a name. -** "default" : Indicates wether the group is visible or not. Possible values: 'inlineÄ', 'none'. -** "title" : When the group is visible, this title is displayed in the header line. -** "desc" : This optional Description is displayed under the title. -** ""contains_required" : Indicates that this Group contains field that are required -** -** Note: - The first group which default is 'inline' will the group that is selected when opening the Page. -** - You always need a group_end for a group. Otherwise everything below will belong to the group. -*/ - -function makeSectionTabs($array) { - $tabs=array(); - $initialtab=''; - foreach ($array as $key => $var) { - if(isset($var['type']) && $var['type'] == 'group_start') { - $tab[]=$var; - } - } - - echo "\n"; - echo "\n"; - $tabcount=0; - foreach ($tab as $cell) { - $tabcount++; - if ($cell['default'] == 'inline') { - $class = 'class="tab-hi"'; - if ($initialtab == '') { - $initialtab=$cell['name']; - } - } - else { - $class = 'class="tab"'; - } - echo "\n\t'; - echo "\n\t"; - if ($tabcount %7 ==0) { - echo "\n\n
"; - echo ''. $cell['title'] . ' '; - if (isset($cell['contains_required'])) { - echo '*'; - } - echo ' 
"; - echo "\n\n"; - } - } - echo "\n"; - echo "\n
\n"; - - echo "\n". '\n"; -} - -function configLogin($target) { - global $gallery; - - if (fs_file_exists(GALLERY_SETUPDIR . "/resetadmin")) { - $resetFile = getFile(GALLERY_SETUPDIR . "/resetadmin"); - $resetFile = trim($resetFile); - } - else { - // If the file is not present (perhaps removed after visiting the config page) - // unset the Guid so we don't keep asking for something that's not there. - $gallery->session->resetAdminGuid = null; - } - - // The gallery has never been configured, or the admin password has been lost and needs to be reset - ignore login requirement - // If the user has already logged in, and is viewing one of the setup pages, they will be logged in automatically by the form - if (!isset($gallery->app->userDir) || (isset($gallery->session->resetAdminGuid) && $gallery->session->resetAdminGuid == $resetFile)) { - return; - } - else { - // Load userDB for password validation - this is a re-configuration - require_once(GALLERY_BASE . '/classes/User.php'); - require_once(GALLERY_BASE . '/classes/EverybodyUser.php'); - require_once(GALLERY_BASE . '/classes/NobodyUser.php'); - require_once(GALLERY_BASE . '/classes/LoggedInUser.php'); - require_once(GALLERY_BASE . '/classes/UserDB.php'); - require_once(GALLERY_BASE . '/classes/gallery/UserDB.php'); - require_once(GALLERY_BASE . '/classes/gallery/User.php'); - $gallery->userDB = new Gallery_UserDB(); - - // Check the UserDB for upgrades before trying to make someone login - if ($gallery->userDB->versionOutOfDate()) - { - include(GALLERY_BASE . "/upgrade_users.php"); - exit; - } - - include(dirname(__FILE__) . "/login.inc"); - } -} - -?> diff -Naur gallery-1.5-pl1/setup/ghcc.php gallery-1.5.1/setup/ghcc.php --- gallery-1.5-pl1/setup/ghcc.php 2005-03-10 03:36:35.000000000 +0100 +++ gallery-1.5.1/setup/ghcc.php 2005-09-13 00:41:29.000000000 +0200 @@ -17,9 +17,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: ghcc.php,v 1.8.6.1 2005/03/10 02:36:35 cryptographite Exp $ + * $Id: ghcc.php,v 1.9.2.1 2005/09/12 22:41:29 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/setup/index.php gallery-1.5.1/setup/index.php --- gallery-1.5-pl1/setup/index.php 2005-03-10 03:36:35.000000000 +0100 +++ gallery-1.5.1/setup/index.php 2005-09-13 00:41:29.000000000 +0200 @@ -15,20 +15,23 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: index.php,v 1.71.2.1 2005/03/10 02:36:35 cryptographite Exp $ + * $Id: index.php,v 1.72.2.3 2005/09/12 22:41:29 dmolavi Exp $ */ ?> + app->photoAlbumURL)) { + define ('GALLERY_URL','..'); +} if (getOS() == OS_WINDOWS) { require(GALLERY_BASE . '/platform/fs_win32.php'); @@ -39,9 +41,10 @@ require(GALLERY_BASE . '/platform/fs_unix.php'); } - @include (GALLERY_BASE . '/config.php'); - require (GALLERY_BASE . '/Version.php'); - require(GALLERY_BASE . "/session.php"); +@include (GALLERY_BASE . '/config.php'); +require (GALLERY_BASE . '/Version.php'); +require (GALLERY_BASE . '/session.php'); +require (GALLERY_BASE . '/lib/setup.php'); // We can't set devMode until after config.php is loaded if (isset($gallery->app->devMode) && $gallery->app->devMode == "yes") { @@ -51,10 +54,10 @@ } /* Set Language etc. */ - initLanguage(); + initLanguage(); /* We do this to get the config stylesheet */ - $GALLERY_OK=false; + $GALLERY_OK = false; /* * Turn off magic quotes runtime as they interfere with saving and @@ -91,4 +94,4 @@ $GALLERY_REWRITE_OK = 0; } -?> +?> \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5-pl1/setup/login.inc gallery-1.5.1/setup/login.inc --- gallery-1.5-pl1/setup/login.inc 2005-03-10 03:36:35.000000000 +0100 +++ gallery-1.5.1/setup/login.inc 2005-09-13 00:41:29.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: login.inc,v 1.16.2.1 2005/03/10 02:36:35 cryptographite Exp $ + * $Id: login.inc,v 1.17.2.1 2005/09/12 22:41:29 dmolavi Exp $ */ ?> diff -Naur gallery-1.5-pl1/setup/session_test.php gallery-1.5.1/setup/session_test.php --- gallery-1.5-pl1/setup/session_test.php 2005-03-23 10:06:00.000000000 +0100 +++ gallery-1.5.1/setup/session_test.php 2005-09-13 00:41:29.000000000 +0200 @@ -15,17 +15,15 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: session_test.php,v 1.25.2.2 2005/03/23 09:06:00 cryptographite Exp $ + * $Id: session_test.php,v 1.27.2.2 2005/09/12 22:41:29 dmolavi Exp $ */ ?> $value) { diff -Naur gallery-1.5-pl1/setup/write.inc gallery-1.5.1/setup/write.inc --- gallery-1.5-pl1/setup/write.inc 2005-03-10 03:36:35.000000000 +0100 +++ gallery-1.5.1/setup/write.inc 2005-09-13 00:41:29.000000000 +0200 @@ -15,12 +15,16 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: write.inc,v 1.65.2.1 2005/03/10 02:36:35 cryptographite Exp $ + * $Id: write.inc,v 1.66.2.2 2005/09/12 22:41:29 dmolavi Exp $ */ ?> - + app->userDir exists. */ + include(GALLERY_BASE . '/config.php'); include_once(GALLERY_BASE . '/classes/UserDB.php'); include_once(GALLERY_BASE . '/classes/gallery/UserDB.php'); diff -Naur gallery-1.5-pl1/skins/bars002/css/screen.css gallery-1.5.1/skins/bars002/css/screen.css --- gallery-1.5-pl1/skins/bars002/css/screen.css 2005-02-01 12:39:33.000000000 +0100 +++ gallery-1.5.1/skins/bars002/css/screen.css 2005-04-28 00:58:11.000000000 +0200 @@ -372,7 +372,7 @@ background-color: #909090; } -.popuphead /* controls the title and background */ +.popuphead, .separator /* controls the title and background */ { margin: 0px; padding:0px; background-image: url(../images/navbar.jpg); @@ -417,4 +417,12 @@ #adminbox { color: #000000; -} \ Pas de fin de ligne à la fin du fichier. +} + +.tab { + color: #c0c0c0; +} + +.tab-hi { + background-color: #c0c0c0; color: #000000; +} diff -Naur gallery-1.5-pl1/skins/bblue/css/screen.css gallery-1.5.1/skins/bblue/css/screen.css --- gallery-1.5-pl1/skins/bblue/css/screen.css 2005-03-01 08:51:08.000000000 +0100 +++ gallery-1.5.1/skins/bblue/css/screen.css 2005-04-17 16:02:04.000000000 +0200 @@ -429,7 +429,7 @@ { text-align:center; font-size: 12px; - font-weight: none; + font-weight: normal; color: #202020; padding: 5px; border: 1px solid #000000; @@ -440,7 +440,7 @@ .popupform /* controls form textarea */ { font-size: 12px; - font-weight: none; + font-weight: normal; line-height: 120%; color: #202020; padding: 2px; diff -Naur gallery-1.5-pl1/skins/bgreen/css/screen.css gallery-1.5.1/skins/bgreen/css/screen.css --- gallery-1.5-pl1/skins/bgreen/css/screen.css 2005-03-01 08:51:08.000000000 +0100 +++ gallery-1.5.1/skins/bgreen/css/screen.css 2005-04-21 23:39:52.000000000 +0200 @@ -29,7 +29,7 @@ A:hover { color: #C0C0C0; } -textarea:focus, select:focus { +textarea:focus { background-color: #FFFFFF; } @@ -445,7 +445,7 @@ { text-align:center; font-size: 12px; - font-weight: none; + font-weight: normal; color: #202020; padding: 5px; border: 1px solid #000000; @@ -456,7 +456,7 @@ .popupform /* controls form textarea */ { font-size: 12px; - font-weight: none; + font-weight: normal; line-height: 120%; color: #202020; padding: 2px; diff -Naur gallery-1.5-pl1/skins/bgreen2/css/screen.css gallery-1.5.1/skins/bgreen2/css/screen.css --- gallery-1.5-pl1/skins/bgreen2/css/screen.css 2005-03-01 08:51:09.000000000 +0100 +++ gallery-1.5.1/skins/bgreen2/css/screen.css 2005-04-21 23:39:52.000000000 +0200 @@ -27,7 +27,7 @@ A:active { color: #404040; } A:hover { color: #C0C0C0; } -textarea:focus, select:focus { +textarea:focus { background-color: #FFFFFF; } @@ -423,7 +423,7 @@ .popup /* controls the main text and message body */ { text-align:center; - font-size: 12px; font-weight: none; + font-size: 12px; font-weight: normal; color: #202020; padding: 5px; border: 1px solid #000000; @@ -434,7 +434,7 @@ .popupform /* controls form textarea */ { font-size: 12px; - font-weight: none; + font-weight: normal; line-height: 120%; color: #202020; padding: 2px; diff -Naur gallery-1.5-pl1/skins/bpurple/css/screen.css gallery-1.5.1/skins/bpurple/css/screen.css --- gallery-1.5-pl1/skins/bpurple/css/screen.css 2005-03-01 08:51:12.000000000 +0100 +++ gallery-1.5.1/skins/bpurple/css/screen.css 2005-04-21 23:39:53.000000000 +0200 @@ -27,7 +27,7 @@ A:active { color: #404040; } A:hover { color: #C0C0C0; } -textarea:focus, select:focus { +textarea:focus { background-color: #FFFFFF; } @@ -414,7 +414,7 @@ .popup /* controls the main text and message body */ { text-align:center; - font-size: 12px; font-weight: none; + font-size: 12px; font-weight: normal; color: #202020; padding: 5px; border: 1px solid #000000; diff -Naur gallery-1.5-pl1/skins/bred/css/screen.css gallery-1.5.1/skins/bred/css/screen.css --- gallery-1.5-pl1/skins/bred/css/screen.css 2005-03-01 08:51:13.000000000 +0100 +++ gallery-1.5.1/skins/bred/css/screen.css 2005-04-21 23:39:53.000000000 +0200 @@ -27,7 +27,7 @@ A:active { color: #404040; } A:hover { color: #C0C0C0; } -textarea:focus, select:focus { +textarea:focus { background-color: #FFFFFF; } @@ -417,7 +417,7 @@ .popup /* controls the main text and message body */ { text-align:center; - font-size: 12px; font-weight: none; + font-size: 12px; font-weight: normal; color: #202020; padding: 5px; border: 1px solid #000000; diff -Naur gallery-1.5-pl1/skins/jenskin/css/screen.css gallery-1.5.1/skins/jenskin/css/screen.css --- gallery-1.5-pl1/skins/jenskin/css/screen.css 2005-03-10 03:36:36.000000000 +0100 +++ gallery-1.5.1/skins/jenskin/css/screen.css 2005-09-13 00:41:29.000000000 +0200 @@ -3,7 +3,7 @@ album 'bgcolor', 'background', and 'textcolor' properties. */ /* - $Id: screen.css,v 1.1.2.4 2005/03/10 02:36:36 cryptographite Exp $ + $Id: screen.css,v 1.4.2.1 2005/09/12 22:41:29 dmolavi Exp $ Gallery - a web based photo album viewer and editor Copyright (C) 2000-2005 Bharat Mediratta @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ diff -Naur gallery-1.5-pl1/skins/lilac/css/screen.css gallery-1.5.1/skins/lilac/css/screen.css --- gallery-1.5-pl1/skins/lilac/css/screen.css 2005-03-03 01:07:14.000000000 +0100 +++ gallery-1.5.1/skins/lilac/css/screen.css 2005-04-21 23:39:53.000000000 +0200 @@ -27,8 +27,8 @@ A:active { color: #EFEFF3; } A:hover { color: #FFFFC0; text-decoration: underline} -textarea:focus, select:focus { - background-color: #FFFFFF; +textarea:focus { + background-color: #FFFFFF; } /* diff -Naur gallery-1.5-pl1/skins/madmod1/css/screen.css gallery-1.5.1/skins/madmod1/css/screen.css --- gallery-1.5-pl1/skins/madmod1/css/screen.css 2005-02-01 12:39:34.000000000 +0100 +++ gallery-1.5.1/skins/madmod1/css/screen.css 2005-04-17 16:02:07.000000000 +0200 @@ -271,7 +271,7 @@ .popup { font-size: 12px; - font-weight: none; + font-weight: normal; color: #202020; padding: 5px; border: 1px solid #000000; @@ -281,7 +281,7 @@ .popupform { font-size: 12px; - font-weight: none; + font-weight: normal; line-height: 120%; color: #202020; padding: 2px; diff -Naur gallery-1.5-pl1/skins/yellow/css/screen.css gallery-1.5.1/skins/yellow/css/screen.css --- gallery-1.5-pl1/skins/yellow/css/screen.css 2005-03-01 08:51:40.000000000 +0100 +++ gallery-1.5.1/skins/yellow/css/screen.css 2005-04-21 23:39:54.000000000 +0200 @@ -26,8 +26,8 @@ A:visited { color: #E91414; text-decoration: none; } A:hover { color: #E91414; text-decoration: underline} -textarea:focus, input:focus, select:focus { - background-color: #F5BF50; +textarea:focus, input:focus { + background-color: #F5BF50; } /* diff -Naur gallery-1.5-pl1/slideshow.php gallery-1.5.1/slideshow.php --- gallery-1.5-pl1/slideshow.php 2005-04-14 04:11:36.000000000 +0200 +++ gallery-1.5.1/slideshow.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: slideshow.php,v 1.72.2.3 2005/04/14 02:11:36 cryptographite Exp $ + * $Id: slideshow.php,v 1.77.2.2 2005/09/12 22:40:44 dmolavi Exp $ */ ?> app->photoAlbumURL."/images"; -$upArrowURL = ''; #-- breadcrumb text --- $upArrowURL = ''; + 'alt="' . _("navigate UP") .'" title="' . _("navigate UP") .'" border="0">'; -if (isset($gallery->album) && $gallery->album->fields['returnto'] != 'no') { +if (isset($gallery->album)) { foreach ($gallery->album->getParentAlbums(true) as $navAlbum) { - $breadcrumb["text"][] = $navAlbum['prefixText'] .': '. - $navAlbum['title'] . " " . $upArrowURL . ""; + $breadcrumb["text"][] = $navAlbum['prefixText'] .': '. + $navAlbum['title'] . " " . $upArrowURL . ""; } -} else { - /* We're on mainpage */ - $breadcrumb["text"][]= _("Gallery") .": " . - $gallery->app->galleryTitle . " " . $upArrowURL . ""; +} +else { + /* We're on mainpage */ + $breadcrumb["text"][]= _("Gallery") .": " . + $gallery->app->galleryTitle . " " . $upArrowURL . ""; } $breadcrumb["bordercolor"] = $borderColor; @@ -231,7 +230,7 @@ slideshow_image(); -includeLayout('ml_pulldown.inc'); +echo languageSelector(); includeHtmlWrap("slideshow.footer"); if (!$GALLERY_EMBEDDED_INSIDE) { ?> diff -Naur gallery-1.5-pl1/sort_album.php gallery-1.5.1/sort_album.php --- gallery-1.5-pl1/sort_album.php 2005-03-10 03:29:37.000000000 +0100 +++ gallery-1.5.1/sort_album.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: sort_album.php,v 1.32.2.1 2005/03/10 02:29:37 cryptographite Exp $ + * $Id: sort_album.php,v 1.33.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> + */ +?> + + + + <?php echo _("Poststamp preview"); ?> + + + +

+
+ + +"; + echo "\n". ''; + echo "\n". '"; + echo "\n"; +} +?> + +
'. $i .''; + echo "\n\t" . ''; + echo "\n
+ + diff -Naur gallery-1.5-pl1/stats.php gallery-1.5.1/stats.php --- gallery-1.5-pl1/stats.php 2005-08-25 05:47:35.000000000 +0200 +++ gallery-1.5.1/stats.php 2005-09-22 02:29:50.000000000 +0200 @@ -1,208 +1,292 @@ where x is the number of months -* that you want to display. For example: -* stats.php?type=date&period=0 displays all photos uploaded during -* the current month. -* stats.php?type=views?period=1 displays the number of views (clicks) -* for all photos uploaded during the last month and the current month -* stats.php?type=date&period=6 covers the last 6 months. -* -* The images listed can be restricted to one album by using the album -* parameter. For example: -* stats.php?type=date&album=new displays only images from the new album. -* -* More details are available in the readme. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or (at -* your option) any later version. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* -* Copyright (C) 2004 Jeremy Gilliat with rating contribution by Haplo -* based on Bharat Mediratta's standard Gallery code. -* -* $Id: stats.php,v 1.12.2.8 2005/08/25 03:47:35 cryptographite Exp $ -*/ - +/** + * Stats is a Gallery mod that allows photo statistics to be displayed. + * Use the url variable "type" to select the statistic to display. + * + * - number of views (clicks) - use stats.php?type=views + * - upload date - use stats.php?type=date + * - number of votes (stats votes) - use stats.php?type=votes + * - ratings (Gallery votes) - use stats.php?type=ratings + * - capture date - use stats.php?type=cdate + * - latest comments - use stats.php?type=comments + * - random images - use stats.php?type=random + * + * The photos displayed can be restricted by their upload date. + * Use stats.php?type=date&period= where x is the number of months + * that you want to display. For example: + * stats.php?type=date&period=0 displays all photos uploaded during + * the current month. + * stats.php?type=views?period=1 displays the number of views (clicks) + * for all photos uploaded during the last month and the current month + * stats.php?type=date&period=6 covers the last 6 months. + * + * The images listed can be restricted to one album by using the album + * parameter. For example: + * stats.php?type=date&album=new displays only images from the new album. + * + * More details are available in the readme. + * + * 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. + * + * @package Stats + * @author Jeremy Gilliat + * @author Haplo + * @author Jens Tkotz + */ + +/** + * 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. + * + * Copyright (C) 2004 Jeremy Gilliat with rating contribution by Haplo + * based on Bharat Mediratta's standard Gallery code. + * + * $Id: stats.php,v 1.30.2.5 2005/09/22 00:29:50 jenst Exp $ + */ require_once(dirname(__FILE__) . '/init.php'); require_once(dirname(__FILE__) . '/includes/stats/stats.inc.php'); -$debug = 0; //$album="album01"; -list ($type, $sca, $sal, $sde, $sco, $scd, $sud, $svi, $sac, $svo, $sav, $sao, $stm, $rev, $tsz ,$ppp, $total, $sgr, $rows, $cols, $addLinksPos) = - getRequestVar(array('type', 'sca', 'sal', 'sde', 'sco', 'scd', 'sud', 'svi', 'sac', 'svo', 'sav', 'sao', 'stm', 'rev', 'tsz' ,'ppp', 'total', 'sgr', 'rows', 'cols', 'addLinksPos')); +list ($type, $sca, $sal, $sde, $sco, $scd, $sud, $svi, $sac, $svo, $sav, $sao, $stm, $reverse, $tsz ,$ppp, $total, $showGrid, $rows, $cols, $addLinksPos) = + getRequestVar(array('type', 'sca', 'sal', 'sde', 'sco', 'scd', 'sud', 'svi', 'sac', 'svo', 'sav', 'sao', 'stm', 'reverse', 'tsz' ,'ppp', 'total', 'showGrid', 'rows', 'cols', 'addLinksPos')); list ($ty, $tm, $td) = getRequestVar(array('ty', 'tm', 'td')); list ($page, $set_albumListPage) = - getRequestVar(array('page', 'set_albumListPage')); + getRequestVar(array('page', 'set_albumListPage')); +if (empty($type)) { + /* We assume was called direct. So we call show defaults */ + header("Location: ". unhtmlentities(defaultStatsUrl('views'))); +} -if (empty($type) || eregi('[^a-z]', $type)) { - /* We assume was called direct. So we call show defaults */ - header("Location: ". unhtmlentities(defaultStatsUrl('views'))); +$reverse = (bool)$reverse; + +/* Start of HTML Output to show page in valid HTML when debug is ON */ +switch ($type) { + case 'votes': + if ($reverse) { + $stats_title = _(" - Images with the least votes"); + } + else { + $stats_title = _(" - Images with the most votes"); + } + break; + + case 'ratings': + if ($reverse ) { + $stats_title = _(" - Bottom rated images"); + } + else { + $stats_title = _(" - Top rated images"); + } + break; + + case 'date': + if ($reverse ) { + $stats_title = _(" - Oldest images first"); + } + else { + + $stats_title = _(" - Latest added images"); + } + break; + + case 'cdate': + if ($reverse ) { + $stats_title = _(" - Oldest Capture Date"); + } + else { + $stats_title = _(" - Latest Capture Date"); + } + break; + + case 'comments': + if ($reverse ) { + $stats_title = _(" - Oldest Comments"); + } + else { + $stats_title = _(" - Latest Comments"); + } + break; + + case 'random': + $stats_title = _(" - Random Images"); + break; + + default: + // 'views' + $type = 'views'; + if ($reverse ) { + $stats_title = _(" - Images with the least views"); + } + else { + $stats_title = _(" - Images with the most views"); + } + break; } -$rating = ""; -$ratingCount = ""; -$randomNum = ""; -$pixelImage = 'pixel_trans'; +if (!$GALLERY_EMBEDDED_INSIDE) { + doctype(); +?> + + + <?php echo $gallery->app->galleryTitle . $stats_title; ?> + + + +'; + +$time_start = getmicrotime(); + class cacheCtrl { - var $enabled; - var $expireSecs; + var $enabled; + var $expireSecs; - function cacheCtrl($enabled = 0, $expireSecs = -1) { - $this->enabled = $enabled; - $this->expireSecs = $expireSecs; - } + function cacheCtrl($enabled = 0, $expireSecs = -1) { + $this->enabled = $enabled; + $this->expireSecs = $expireSecs; + } } define("CACHE_INDEX_FIELD_WIDTH", 16); // Always show comments if only displaying images that have comments. -if ( $type == "comments" ) { - $showComments = 1; - $cache = new cacheCtrl( $gallery->app->stats_commentsCacheOn, $gallery->app->stats_commentsCacheExpireSecs ); +if ($type == "comments" ) { + $showComments = 1; + $cache = new cacheCtrl( $gallery->app->stats_commentsCacheOn, $gallery->app->stats_commentsCacheExpireSecs ); } /* ** Commented out, because the rating code is broken. -else if ( $type == "ratings" ) { - $showRatings = 1; - $cache = new cacheCtrl( $gallery->app->stats_ratingsCacheOn, $gallery->app->stats_ratingsCacheExpireSecs ); +else if ($type == "ratings" ) { +$showRatings = 1; +$cache = new cacheCtrl( $gallery->app->stats_ratingsCacheOn, $gallery->app->stats_ratingsCacheExpireSecs ); } */ -else if ( $type == "views" ) { - $showViews = 1; - $cache = new cacheCtrl($gallery->app->stats_viewsCacheOn, $gallery->app->stats_viewsCacheExpireSecs); -} -else if ( $type == "date" ) { - $showUploadDate = 1; - $cache = new cacheCtrl( $gallery->app->stats_dateCacheOn, $gallery->app->stats_dateCacheExpireSecs ); -} -else if ( $type == "cdate" ) { - $showCaptureDate = 1; - $cache = new cacheCtrl( $gallery->app->stats_cDateCacheOn, $gallery->app->stats_cDateCacheExpireSecs ); -} -else if ( $type == "votes" ) { - $showVotes = 1; - $cache = new cacheCtrl( $gallery->app->stats_votesCacheOn, $gallery->app->stats_votesCacheExpireSecs ); +else if ($type == "views" ) { + $showViews = 1; + $cache = new cacheCtrl($gallery->app->stats_viewsCacheOn, $gallery->app->stats_viewsCacheExpireSecs); +} +else if ($type == "date" ) { + $showUploadDate = 1; + $cache = new cacheCtrl( $gallery->app->stats_dateCacheOn, $gallery->app->stats_dateCacheExpireSecs ); +} +else if ($type == "cdate" ) { + $showCaptureDate = 1; + $cache = new cacheCtrl( $gallery->app->stats_cDateCacheOn, $gallery->app->stats_cDateCacheExpireSecs ); +} +else if ($type == "votes" ) { + $showVotes = 1; + $cache = new cacheCtrl( $gallery->app->stats_votesCacheOn, $gallery->app->stats_votesCacheExpireSecs ); } else { - $cache = new cacheCtrl; + $cache = new cacheCtrl; } -// Check for any control variables passed in the url. +/* Check for any control variables passed in the url. */ if (!empty( $sca )) { - $showCaption = $sca; + $showCaption = $sca; } if (!empty( $sal )) { - $showAlbumLink = $sal; + $showAlbumLink = $sal; } if (!empty( $sde )) { - $showDescription = $sde; + $showDescription = $sde; } if (!empty( $scd )) { - $showCaptureDate = $scd; + $showCaptureDate = $scd; } if (!empty( $sud )) { - $showUploadDate = $sud; + $showUploadDate = $sud; } if (!empty( $svi )) { - $showViews = $svi; + $showViews = $svi; } if (!empty( $svo )) { - $showVotes = $svo; + $showVotes = $svo; } /* if (!empty( $sra )) { - $showRatings = $sra; +$showRatings = $sra; } */ if (!empty( $sco )) { - $showComments = $sco; + $showComments = $sco; } if (!empty( $sac )) { - $showAddComment = $sac; + $showAddComment = $sac; } if (!empty( $sav )) { - $showAddVote = $sav; + $showAddVote = $sav; } if (!empty( $sao )) { - $showAlbumOwner = $sao; -} - -if (!empty( $sgr )) { - $showGrid = $sgr; -} - -if (!empty( $rev )) { - $reverseOrder = (bool)$rev; -} else { - $reverseOrder = 0; + $showAlbumOwner = $sao; } if (!empty( $ppp )) { - $photosPerPage = $ppp; + $photosPerPage = $ppp; } if (!empty( $rows )) { - $numRows = $rows; -} - -if (!empty( $cols )) { - $numCols = $cols; + $numRows = $rows; } if (!empty( $total )) { - $totalPhotosToDisplay = $total; + $totalPhotosToDisplay = $total; } if (!empty( $ty )) { - $timeYear = $ty; + $timeYear = $ty; } if (!empty( $tm )) { - $timeMonth = $tm; + $timeMonth = $tm; } if (!empty( $td )) { - $timeDay = $td; + $timeDay = $td; +} + +if (!empty($showGrid)) { + // In grid mode photos per page is controlled by the number of rows and columns. + $photosPerPage = $cols * $numRows; } $albumDB = new AlbumDB(FALSE); @@ -212,15 +296,15 @@ // on all hosts. $numTopAlbums = $albumDB->numAlbums($gallery->user); for ($i = 1; $i <= $numTopAlbums; $i++) { - $topAlbum = $albumDB->getAlbum($gallery->user, $i); - $list[] = $topAlbum; - recurseAlbums( $topAlbum ); + $topAlbum = $albumDB->getAlbum($gallery->user, $i); + $list[] = $topAlbum; + recurseAlbums( $topAlbum ); } $numAlbums = count($list); -if ($debug) { - echo sprintf (_("Number Albums = %s") . "
", $numAlbums) ; -} + +debugMessage(sprintf (_("Number Albums = %s") . "
", $numAlbums),__FILE__ , __LINE__) ; + $skip = array(); $arrPhotos = array(); @@ -229,289 +313,242 @@ // Attempt to load from cache if cache is selected // and a period or album have not been specified. -$cacheFilename = $gallery->app->albumDir . "/stats.$type.$reverseOrder.cache"; -if ( $debug > 1 ) { - echo sprintf (_("Cache filename = %s ; enabled = %s ; expires = %s"), $cacheFilename, $cache->enabled, $cache->expireSecs) . "
"; -} - -if ( !isset($refreshcache) && - !isset($period) && - !isset($album) && - $cache->enabled ) { - if (fs_file_exists($cacheFilename)) { - $cacheState = fs_stat($cacheFilename); - $cacheTime = $cacheState[9]; - if ( $cache->expireSecs == -1 || - time() - $cacheTime < $cache->expireSecs) { - if ( $debug > 1 ) { - echo sprintf (_("Time now = %s ; Cache time = %s"), time(), $cacheTime). "
"; - } - $numPhotos = readCacheNumPhotos($cacheFilename); - if ( $numPhotos != -1 ) { - $arrPhotos = array_fill(0, $numPhotos, 0); - $useCache = true; - } - } - } - - if ( !$useCache ) { - $refreshcache = true; - } - - // Logged in users don't use the cache - if ($gallery->user->isLoggedIn()) { - if ($debug > 1) { - echo _("Logged In - Disabling Cache") . "
"; - } - $refreshcache = false; - $useCache = false; - } -} - -if ( $debug > 1 ) { - if ( $useCache ) { - echo _("Using cache") . "
"; - } - else { - echo _("Not using cache"). "
"; - } - if ( !empty($refreshcache) ) { - echo _("Cache to be rebuilt"). "
"; - } +$cacheFilename = $gallery->app->albumDir . "/stats.$type.$reverse.cache"; +debugMessage(sprintf (_("Cache filename = %s ; enabled = %s ; expires = %s"), $cacheFilename, $cache->enabled, $cache->expireSecs), __FILE__, __LINE__); + +if (!isset($refreshcache) && + !isset($period) && + !isset($album) && + $cache->enabled ) { + if (fs_file_exists($cacheFilename)) { + $cacheState = fs_stat($cacheFilename); + $cacheTime = $cacheState[9]; + if ($cache->expireSecs == -1 || + time() - $cacheTime < $cache->expireSecs) { + debugMessage(sprintf (_("Time now = %s ; Cache time = %s"), time(), $cacheTime), __FILE__, __LINE__); + $numPhotos = readCacheNumPhotos($cacheFilename); + if ($numPhotos != -1 ) { + $arrPhotos = array_fill(0, $numPhotos, 0); + $useCache = true; + } + } + } + + if (!$useCache ) { + $refreshcache = true; + } + + // Logged in users don't use the cache + if ($gallery->user->isLoggedIn()) { + debugMessage(_("Logged In - Disabling Cache"), __FILE__, __LINE__); + $refreshcache = false; + $useCache = false; + } } +debugMessage((!empty($useCache)) ? _("Using cache") : _("Not using cache") ,__FILE__, __LINE__); +debugMessage((!empty($refreshcache)) ? _("Cache to be rebuilt") : _("Cache will not rebuild.") , __FILE__, __LINE__); + // Check if photo data will be loaded from the caches. // If it isn't, then load the photos data and sort. -if ( !$useCache ) { - if ( isset($period ) ) { - $cutoffDate = strftime("%Y") * 12 + strftime("%m") - $period; - } - else { - $cutoffDate = 0; - } - - if ( $type == "random" ) { - // Seed the random number generator. - srand((double)microtime()*1000000); - } - - for ($i = 0; $i<$numAlbums; $i++) { - $statsAlbum = $list[$i]; - if ($statsAlbum->versionOutOfDate()) { - if ( $debug >= 2 ) { - echo _("Version out of date.") ."
"; - } - $skip[] = $statsAlbum; - continue; - } - - /* broken when showNestedAlbums = 1 */ - if (isset($album)) { - if (isset($showNestedAlbums)) { - // Need to show nested images inside the requested album. - if (in_array($album, getParentAlbums($statsAlbum))) { - // Check if this album is the parent - if ( $album == $statsAlbum->fields['name']) { - $albumobj = $statsAlbum; - } - } - else { - // Ignore albums that are not within the specified $album - continue; - } - } - else { - if ( $album == $statsAlbum->fields['name']) { - $albumobj = $statsAlbum; - } - else { - continue; - } - } - } - - $uid = $gallery->user->getUid(); - if ($statsAlbum->canRead($uid) || $gallery->user->isAdmin() || $statsAlbum->isOwner($uid)) { - if ( $debug ) { - echo sprintf (_("Checking album: %s"), $statsAlbum->fields['name']) ."
"; - } - - // Haplo code to make sense of the Gallery rankings. - /* - if ( isset($showRatings) || $type == "ratings" ) { - $ratingAverageList = getRatingAverage(); - } - */ - $numPhotos = $statsAlbum->numPhotos(1); - for ($j = 1; $j <= $numPhotos; $j++) { - if ( $debug > 1 ) { - echo sprintf (_("Reading info for photo index = %d , id = %d"), $j, $statsAlbum->getPhotoId($j)). "
"; - } - - if (! $statsAlbum->isAlbum($j) && - (!$statsAlbum->isHidden($j) || $gallery->user->isAdmin())) { - $uploaddate = $statsAlbum->getUploadDate($j); - - if ( strftime("%Y",$uploaddate ) * 12 + strftime("%m",$uploaddate) >= $cutoffDate ) { - // If displaying latest comments, - // then only list photos with comments; - // otherwise display all. - if ( $type != "comments" || - ( $statsAlbum->numComments($j) > 0 && - $statsAlbum->canViewComments($uid) )) { - if ( isset($showVotes) || $type == "votes" ) { - if ( $debug > 2 ) { - echo _("Getting SVotes") ."
"; - } - $votes = $statsAlbum->getItemSVotes($j); - } else { - $votes =""; - } - - if ( $debug > 2 ) { - echo _("Getting Item Clicks") ."
"; - } - $views = $statsAlbum->getItemClicks($j); - - if ( $debug > 2 ) { - echo _("Getting Item Capture Date") ."
"; - } - $captureDate = $statsAlbum->getItemCaptureDate($j); - - // If the user wants stats for a capture date of a - // specific year, month or day then filter out any images - // that do not match. - if ( !empty($timeYear) && $timeYear != strftime("%Y",$captureDate)) { - continue; - } - - if ( !empty($timeMonth) && $timeMonth != strftime("%m", $captureDate)) { - continue; - } - - if ( !empty($timeDay) && $timeDay != strftime("%d", $captureDate)) { - continue; - } - - if ( $debug > 2 ) { - echo _("Getting Number of Comments"). "
"; - } - if ( $statsAlbum->numComments($j) > 0 ) { - if ( $debug > 2 ) { - echo _("Getting Comments") ."
"; - } - $comment = $statsAlbum->getComment( $j, $statsAlbum->numComments($j) ); - $commentDate = $comment->datePosted; - } - else { - $commentDate = 0; - } - /* - if ( isset($showRatings) || $type == "ratings" ) { - if ( $debug > 2 ) { - echo _("Getting Ratings"). "
"; - } - - if (!empty($ratingAverageList[$j])) { - $ratingCount = $ratingAverageList[$j]['count']; - if ( $ratingAverageList[$j]['average'] != 0 ) { - // Only show rating when sufficient votes have been cast. - if ($ratingAverageList[$j]['count'] >= $votesNeededToShowRating ) { - $rating = $ratingAverageList[$j]['average']; - } - else { - $rating = -1; - } - } - else { - $rating = -2; - } - } - } - */ - - if ( $type == "random" ) { - $randomNum = rand(); - } - - $arrPhotos[] = array("albumName" => $statsAlbum->fields['name'], - "photoId" => $statsAlbum->getPhotoId($j), - "votes" => $votes, - "views" => $views, - "uploaddate" => $uploaddate, - "capturedate" => $captureDate, - "commentdate" => $commentDate, - "rating" => $rating, - "ratingcount" => $ratingCount, - "random" => $randomNum ); - if ( $debug > 1 ) { - echo sprintf (_("Album: %s ; Index: %d ; Votes: %d ; Views: %d; Date: %s; Capture: %s; Comment Date: %s; Rating: %s; Rating count: %d; Random: %d"). "
", - $statsAlbum->fields['name'], $j, $votes, $views, $uploaddate, $captureDate, $commentDate, $rating, $ratingCount, $randomNum); - } - } - } - } - } - } - } - - if ( is_array($arrPhotos) ) { - // Set what is returned from the sort comparisons depending - // upon whether the user wants to reverse the sort order or not. - if ( $reverseOrder ) { - $retSortGreater = 1; - $retSortLesser = -1; - } - else { - $retSortGreater = -1; - $retSortLesser = 1; - } - - // Now do the search using the criteria specified by $type. - if ( $type == "votes" ) { - usort($arrPhotos, "votesort"); - } - else if ( $type == "views" ) { - usort($arrPhotos, "viewsort"); - } - else if ( $type == "date" ) { - usort($arrPhotos, "datesort"); - } - else if ( $type == "cdate" ) { - usort($arrPhotos, "capturedatesort"); - } - else if ( $type == "comments" ) { - usort($arrPhotos, "commentdatesort"); - } - else if ( $type == "ratings" ) { - usort($arrPhotos, "ratingsort"); - } - else if ( $type == "random" ) { - usort($arrPhotos, "randomsort"); - } - } +if (empty($useCache)) { + if (!empty($period )) { + $cutoffDate = strftime("%Y") * 12 + strftime("%m") - $period; + } + else { + $cutoffDate = 0; + } + + if ($type == "random" ) { + // Seed the random number generator. + srand((double)microtime()*1000000); + } + + for ($i = 0; $i<$numAlbums; $i++) { + debugMessage("
", __FILE__, __LINE__); + $statsAlbum = $list[$i]; + // print_r($statsAlbum); + if ($statsAlbum->versionOutOfDate()) { + debugMessage(_("Version out of date."), __FILE__, __LINE__, 2); + $skip[] = $statsAlbum; + continue; + } + + /* broken when showNestedAlbums = 1 */ + if (isset($album)) { + if (isset($showNestedAlbums)) { + // Need to show nested images inside the requested album. + if (in_array($album, getParentAlbums($statsAlbum))) { + // Check if this album is the parent + if ($album == $statsAlbum->fields['name']) { + $albumobj = $statsAlbum; + } + } + else { + // Ignore albums that are not within the specified $album + continue; + } + } + else { + if ($album == $statsAlbum->fields['name']) { + $albumobj = $statsAlbum; + } + else { + continue; + } + } + } + + $uid = $gallery->user->getUid(); + if ($statsAlbum->canRead($uid) || $gallery->user->isAdmin() || $statsAlbum->isOwner($uid)) { + debugMessage(sprintf (_("Checking album: %s"), $statsAlbum->fields['name']), __FILE__, __LINE__); + + // Haplo code to make sense of the Gallery rankings. + /* + if (isset($showRatings) || $type == "ratings" ) { + $ratingAverageList = getRatingAverage(); + } + */ + $numPhotos = $statsAlbum->numPhotos(1); + for ($j = 1; $j <= $numPhotos; $j++) { + debugMessage(sprintf (_("Reading info for photo index = %d , id = %d"), $j, $statsAlbum->getPhotoId($j)), __FILE__, __LINE__, 2); + + if (! $statsAlbum->isAlbum($j) && (!$statsAlbum->isHidden($j) || $gallery->user->isAdmin())) { + $uploaddate = $statsAlbum->getUploadDate($j); + + if (strftime("%Y",$uploaddate ) * 12 + strftime("%m",$uploaddate) >= $cutoffDate ) { + // If displaying latest comments, + // then only list photos with comments; + // otherwise display all. + if ($type != "comments" || ( $statsAlbum->numComments($j) > 0 && $statsAlbum->canViewComments($uid) )) { + if (isset($showVotes) || $type == "votes" ) { + debugMessage(_("Getting SVotes"), __FILE__, __LINE__, 2); + $votes = $statsAlbum->getItemSVotes($j); + } else { + $votes = ''; + } + + debugMessage(_("Getting Item Clicks"), __FILE__, __LINE__, 2); + $views = $statsAlbum->getItemClicks($j); + + debugMessage(_("Getting Item Capture Date"), __FILE__, __LINE__, 2); + $captureDate = $statsAlbum->getItemCaptureDate($j); + + // If the user wants stats for a capture date of a + // specific year, month or day then filter out any images + // that do not match. + if (!empty($timeYear) && $timeYear != strftime("%Y",$captureDate)) { + continue; + } + + if (!empty($timeMonth) && $timeMonth != strftime("%m", $captureDate)) { + continue; + } + + if (!empty($timeDay) && $timeDay != strftime("%d", $captureDate)) { + continue; + } + + + debugMessage(_("Getting Number of Comments"), __FILE__, __LINE__, 2); + if ($statsAlbum->numComments($j) > 0 ) { + debugMessage(_("Getting Comments"), __FILE__, __LINE__, 2); + $comment = $statsAlbum->getComment( $j, $statsAlbum->numComments($j) ); + $commentDate = $comment->datePosted; + } + else { + $commentDate = 0; + } + /* + if (isset($showRatings) || $type == "ratings" ) { + debugMessage(_("Getting Ratings"), __FILE__, __LINE__, 2); + + if (!empty($ratingAverageList[$j])) { + $ratingCount = $ratingAverageList[$j]['count']; + if ($ratingAverageList[$j]['average'] != 0 ) { + // Only show rating when sufficient votes have been cast. + if ($ratingAverageList[$j]['count'] >= $votesNeededToShowRating ) { + $rating = $ratingAverageList[$j]['average']; + } + else { + $rating = -1; + } + } + else { + $rating = -2; + } + } + } + */ + + if ($type == "random" ) { + $randomNum = rand(); + } + + $arrPhotos[] = array("albumName" => $statsAlbum->fields['name'], + "photoId" => $statsAlbum->getPhotoId($j), + "votes" => $votes, + "views" => $views, + "uploaddate" => $uploaddate, + "capturedate" => $captureDate, + "commentdate" => $commentDate, + "rating" => $rating, + "ratingcount" => $ratingCount, + "random" => $randomNum ); + debugMessage(sprintf (_("Album: %s ; Index: %d ; Votes: %d ; Views: %d; Date: %s; Capture: %s; Comment Date: %s; Rating: %s; Rating count: %d; Random: %d"). "
", + $statsAlbum->fields['name'], $j, $votes, $views, $uploaddate, $captureDate, $commentDate, $rating, $ratingCount, $randomNum) + , __FILE__, __LINE__, 1); + } + } + } + } + } + } + + $order = ($reverse) ? 'asc' : 'desc'; + if (is_array($arrPhotos) ) { + // Do the search using the criteria specified by $type. + switch ($type) { + case 'votes': + array_sort_by_fields($arrPhotos, 'votes', $order); + break; + case 'views': + array_sort_by_fields($arrPhotos, 'views', $order); + break; + case 'date': + array_sort_by_fields($arrPhotos, 'uploaddate', $order); + break; + case 'cdate': + array_sort_by_fields($arrPhotos, 'capturedate', $order); + break; + case 'comments': + array_sort_by_fields($arrPhotos, 'commentdate', $order); + break; + case 'ratings': + array_sort_by_fields($arrPhotos, 'rating', $order); + break; + case 'random': + array_sort_by_fields($arrPhotos, 'random', $order); + break; + } + } } -if ( !empty($refreshcache) && +if (!empty($refreshcache) && !isset($period) && !isset($album) && is_array($arrPhotos)) { - writeCache($cacheFilename); + writeCache($cacheFilename); } $uid = $gallery->user->getUid(); -if (empty($page) && empty($set_albumListPage)) { - $page = 1; -} elseif (!empty($set_albumListPage)) { - $page = $set_albumListPage; -} if (!isset($totalPhotosToDisplay) || $totalPhotosToDisplay <= 0 || $totalPhotosToDisplay > sizeof($arrPhotos)) { - $totalPhotosToDisplay = sizeof($arrPhotos); + $totalPhotosToDisplay = sizeof($arrPhotos); } if (!isset($photosPerPage)) { - $photosPerPage = $totalPhotosToDisplay; + $photosPerPage = $totalPhotosToDisplay; } $totalPhotosReq = $totalPhotosToDisplay; @@ -519,96 +556,16 @@ // Use fuz factor to avoid rounding up when result is 0.5 $lastpage = round( ($totalPhotosToDisplay / $photosPerPage) - 0.500001) + 1; -if ($debug) { - echo sprintf(_("Total: %s ; Start: %s ; Last Page: %s"), $totalPhotosToDisplay, $startPhoto, $lastpage) . "
"; -} +debugMessage(sprintf(_("Total: %s ; Start: %s ; Last Page: %s"), $totalPhotosToDisplay, $startPhoto, $lastpage), __FILE__, __LINE__); $borderColor = $gallery->app->default["bordercolor"]; -if ( isset($tsz) ) { - $thumbSize = $tsz; +if (isset($tsz) ) { + $thumbSize = $tsz; } else { - $thumbSize = $gallery->app->default["thumb_size"]; -} - -switch ($type) { - case 'votes': - if ( !$reverseOrder ) { - $stats_title = _(" - Images with the most votes"); - } - else { - $stats_title = _(" - Images with the least votes"); - } - break; - - case 'ratings': - if ( !$reverseOrder ) { - $stats_title = _(" - Top rated images"); - } - else { - $stats_title = _(" - Bottom rated images"); - } - break; - - case 'date': - if ( !$reverseOrder ) { - $stats_title = _(" - Latest added images"); - } - else { - $stats_title = _(" - Oldest images first"); - } - break; - - case 'cdate': - if ( !$reverseOrder ) { - $stats_title = _(" - Latest Capture Date"); - } - else { - $stats_title = _(" - Oldest Capture Date"); - } - break; - - case 'comments': - if ( !$reverseOrder ) { - $stats_title = _(" - Latest Comments"); - } - else { - $stats_title = _(" - Oldest Comments"); - } - break; - - case 'random': - $stats_title = _(" - Random Images"); - break; - - default: - // 'views' - $type = 'views'; - if ( !$reverseOrder ) { - $stats_title = _(" - Images with the most views"); - } - else { - $stats_title = _(" - Images with the least views"); - } - break; + $thumbSize = $gallery->app->default["thumb_size"]; } -if (!$GALLERY_EMBEDDED_INSIDE) { - doctype(); -?> - - - <?php echo $gallery->app->galleryTitle . $stats_title; ?> - - - - - includeHtmlWrap("stats.header"); @@ -618,34 +575,34 @@ $adminText = ""; if (isset($album)) { - if (isset($albumobj)) { - if ( $type == "comments" ) { - $adminText .= sprintf(_("%d images with comments in album: %s"), count($arrPhotos), $albumLink); - } else { - $adminText .= sprintf(_("%d images in album: %s"), count($arrPhotos), $albumLink); - } - } else { - $adminText .= sprintf(_("Given albumname: '%s' is invalid !"), $album); - } + if (isset($albumobj)) { + if ($type == "comments" ) { + $adminText .= sprintf(_("%d images with comments in album: %s"), count($arrPhotos), $albumLink); + } else { + $adminText .= sprintf(_("%d images in album: %s"), count($arrPhotos), $albumLink); + } + } else { + $adminText .= sprintf(_("Given albumname: '%s' is invalid !"), $album); + } } else { - if ( $type == "comments" ) { - $adminText .= sprintf(_("%d images with comments in this Gallery"), count($arrPhotos)); - } - else { - $adminText .= sprintf(_("%d images this Gallery"), count($arrPhotos)); - } + if ($type == "comments" ) { + $adminText .= sprintf(_("%d images with comments in this Gallery"), count($arrPhotos)); + } + else { + $adminText .= sprintf(_("%d images this Gallery"), count($arrPhotos)); + } } $adminbox["commands"] = ''; if ($gallery->user->isAdmin()) { - $adminbox["commands"] = '['. _("Back to stats-wizard") .'] '; + $adminbox["commands"] = '['. _("Back to stats-wizard") .'] '; } $adminbox["commands"] .= '['. _("return to gallery") .']'; if (!empty($gallery->app->stats_foruser)) { - $adminText .= "\n
 ". generateStatsLinks(); + $adminText .= "\n
 ". generateStatsLinks(); } $adminbox['text'] = $adminText; @@ -667,141 +624,118 @@ echo ""; includeLayout('navigator.inc'); includeLayout('navtableend.inc'); -includeLayout('ml_pulldown.inc'); +echo languageSelector(); echo ""; -if ( $useCache ) { - readCache($cacheFilename, $startPhoto, $photosPerPage ); +if ($useCache ) { + readCache($cacheFilename, $startPhoto, $photosPerPage ); } if (isset($stm)) { - $time = getmicrotime() - $time_start; - echo sprintf(_("Data load time %d seconds"), $time); + $time = getmicrotime() - $time_start; + echo sprintf(_("Data load time %d seconds"), $time); } - /* Start of album layout style. */ - echo ''; +/* Start of album layout style. */ - for ($j = $startPhoto; $j < $totalPhotosToDisplay && $j < $startPhoto + $photosPerPage; $j+=1) { - $photoInfo = $arrPhotos[$j]; - for ( $i = 0; $i < $numAlbums; ++$i ) { - if ( !strcmp($photoInfo['albumName'], $list[$i]->fields['name']) ) { - $statsAlbum = $list[$i]; - break; - } - } - - if (!isset($statsAlbum)) { - // Album deleted. - $cacheReloadRequired = true; - } - else { - $photoId = $photoInfo['photoId']; - $photoIndex = $statsAlbum->getPhotoIndex($photoId); - if ( $photoIndex == -1 ) { - $cacheReloadRequired = true; - } - else { - if ($statsAlbum->canRead($uid) || $gallery->user->isAdmin()) { - if (!$statsAlbum->isHidden($photoIndex) || - $statsAlbum->isOwner($uid) || - $gallery->user->isAdmin()) { - $statsCaption = $statsAlbum->getCaption($photoIndex); - $statsCaption .= $statsAlbum->getCaptionName($photoIndex); - $statsUrl = makeAlbumUrl($statsAlbum->fields['name'], $photoId); -?> - - - - - - - - - - +echo '
'; - +$statsTable = new galleryTable(); +$statsTable->setColumnCount(2 * $cols); +$statsTable->setAttrs(array( + 'id' => 'statsTable', + 'width' => $navigator["fullWidth"] . $navigator["widthUnits"], + 'border' => 0, + 'cellspacing' => 7)); + +for ($j = $startPhoto; $j < $totalPhotosToDisplay && $j < $startPhoto + $photosPerPage; $j+=1) { + $photoInfo = $arrPhotos[$j]; + for ( $i = 0; $i < $numAlbums; ++$i ) { + if (!strcmp($photoInfo['albumName'], $list[$i]->fields['name']) ) { + $statsAlbum = $list[$i]; + break; + } + } + + if (!isset($statsAlbum)) { + // Album deleted. + $cacheReloadRequired = true; + } + else { + $photoId = $photoInfo['photoId']; + $photoIndex = $statsAlbum->getPhotoIndex($photoId); + if ($photoIndex == -1 ) { + $cacheReloadRequired = true; + } + else { + if ($statsAlbum->canRead($uid) || $gallery->user->isAdmin()) { + if (!$statsAlbum->isHidden($photoIndex) || $statsAlbum->isOwner($uid) || $gallery->user->isAdmin()) { + $statsCaption = $statsAlbum->getCaption($photoIndex); + $statsCaption .= $statsAlbum->getCaptionName($photoIndex); + $statsUrl = makeAlbumUrl($statsAlbum->fields['name'], $photoId); + + // Image Cell + $statsTable->addElement(array( + 'content' => "". $statsAlbum->getThumbnailTag($photoIndex, $thumbSize) . "", + 'cellArgs' => array('align' => 'center', 'valign' => 'top'))); + + // Text Cell --> + $statsTable->addElement(array( + 'content' => displayTextCell($statsAlbum, $photoIndex, $photoId, $photoInfo['rating'], $photoInfo['ratingcount']), + 'cellArgs' => array('align' => 'left', 'valign' => 'top', 'class' => 'albumdesc'))); + } + } + } + } +} - -render(); - echo "
+if (empty($showGrid)) { + $cols = 1; + $style = 'style="margin-right:3px; float:left"'; +} else { + $style = ''; +} -html_wrap['borderColor'] = $borderColor; -$gallery->html_wrap['borderWidth'] = 1; -$gallery->html_wrap['pixelImage'] = getImagePath('pixel_trans.gif'); -$scaleTo = $gallery->app->highlight_size; -$iWidth = $gallery->app->highlight_size; -$iHeight = 100; -/*begin backwards compatibility */ -$gallery->html_wrap['thumbWidth'] = $iWidth; -$gallery->html_wrap['thumbHeight'] = $iHeight; -$gallery->html_wrap['thumbTag'] = $statsAlbum->getThumbnailTag($photoIndex, $thumbSize); -$gallery->html_wrap['thumbHref'] = $statsUrl; -/*end backwards compatibility*/ -$gallery->html_wrap['imageTag'] = $statsAlbum->getThumbnailTag($photoIndex, $thumbSize); - -// Added for Gallery 1.44 -$imgTag = $gallery->html_wrap['imageTag']; -$gallery->html_wrap['imageWidth'] = getWidthFromTag($imgTag); -$gallery->html_wrap['imageHeight'] = getHeightFromTag($imgTag); - -$gallery->html_wrap['imageHref'] = $statsUrl; -$gallery->html_wrap['frame'] = $statsAlbum->fields['thumb_frame']; -includeHtmlWrap('inline_gallerythumb.frame'); -?> -  
"; - -if (isset($stm)) { - $time = getmicrotime() - $time_start; - echo sprintf (_("Finished in %d seconds"), $time). "\n"; -} +$time = getmicrotime() - $time_start; +echo infoLine(sprintf (_("Finished in %d seconds"), $time), 'success1'); if ($cacheReloadRequired) { - $url = makeStatsUrl( $page ); - $url .= "&refreshcache=1"; - $urlhref = '['. _("Update") .']'; - echo gallery_error(_("Cache update required. ").$urlhref); + $url = makeStatsUrl( $page ); + $url .= "&refreshcache=1"; + $urlhref = '['. _("Update") .']'; + echo gallery_error(_("Cache update required. ").$urlhref); } if (sizeof($skip) > 0) { - echo gallery_error(sprintf(_("Some albums not searched as they require upgrading to the latest version of %s first"),Gallery())); - if ($gallery->user->isAdmin()) { - print ":
"; - echo popup_link(_("upgrade all albums"), "upgrade_album.php"); - print "
("; - $join_text=''; - foreach($skip as $stalbum) { - $link = makeGalleryUrl("view_album.php", - array("set_albumName" => $stalbum->fields["name"])); - echo $join_text .''. $stalbum->fields["name"] .''; - $join_text=", "; - } - print ")"; - } - else { - print "."; - } - echo "

"; + echo gallery_error(sprintf(_("Some albums not searched as they require upgrading to the latest version of %s first"),Gallery())); + if ($gallery->user->isAdmin()) { + print ":
"; + echo popup_link(_("upgrade all albums"), "upgrade_album.php"); + print "
("; + $join_text=''; + foreach($skip as $stalbum) { + $link = makeGalleryUrl("view_album.php", + array("set_albumName" => $stalbum->fields["name"])); + echo $join_text .''. $stalbum->fields["name"] .''; + $join_text=", "; + } + print ")"; + } + else { + print "."; + } + echo "

"; } echo "
"; -?> - - + includeLayout('navtablebegin.inc'); includeLayout('navigator.inc'); includeLayout('navtableend.inc'); -includeLayout('ml_pulldown.inc'); +echo languageSelector(); includeHtmlWrap("stats.footer"); if (!$GALLERY_EMBEDDED_INSIDE) { ?> @@ -814,600 +748,457 @@ */ function getmicrotime() { - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); + list($usec, $sec) = explode(" ", microtime()); + return ((float)$usec + (float)$sec); } function recurseAlbums( $parentAlbum) { - global $debug, $list, $gallery; - if ($parentAlbum) { - if ( $debug >= 2 ) { - echo sprintf(_("Recursing album: %s"), $parentAlbum->fields['name']) ."
"; - } - - $numPhotos = $parentAlbum->numPhotos(1); - for ($j = 1; $j <= $numPhotos; $j++) { - if ($parentAlbum->isAlbum($j) && - (!$parentAlbum->isHidden($j) || $gallery->user->isAdmin()) ) { - $childAlbumName = $parentAlbum->getAlbumName($j); - $childAlbum = new Album(); - $childAlbum->load($childAlbumName); - $list[] = $childAlbum; - recurseAlbums($childAlbum); - } - } - } + global $list, $gallery; + if ($parentAlbum) { + debugMessage(sprintf(_("Recursing album: %s"), $parentAlbum->fields['name']),__FILE__, __LINE__, 2); + + $numPhotos = $parentAlbum->numPhotos(1); + for ($j = 1; $j <= $numPhotos; $j++) { + if ($parentAlbum->isAlbum($j) && + (!$parentAlbum->isHidden($j) || $gallery->user->isAdmin()) ) { + $childAlbumName = $parentAlbum->getAlbumName($j); + $childAlbum = new Album(); + $childAlbum->load($childAlbumName); + $list[] = $childAlbum; + recurseAlbums($childAlbum); + } + } + } } function myFlock($fd, $op) { - global $gallery; - if (!strcmp($gallery->app->use_flock, "yes")) { - $res = flock($fd, $op); - } - else { - $res = 1; - } + global $gallery; + if (!strcmp($gallery->app->use_flock, "yes")) { + $res = flock($fd, $op); + } + else { + $res = 1; + } - return $res; + return $res; } function readCacheNumPhotos( $cacheFilename ) { - global $debug; + $numPhotos = -1; + if ($fd = fs_fopen($cacheFilename, "rb")) { + if (myFlock($fd, LOCK_SH)) { + $numPhotos = fgets($fd); + myFlock($fd, LOCK_UN); + } + else { + debugMessage(_("Read cache num photos lock failed."), __FILE__, __LINE__, 2); + } + fclose($fd); + } - $numPhotos = -1; - if ($fd = fs_fopen($cacheFilename, "rb")) { - if (myFlock($fd, LOCK_SH)) { - $numPhotos = fgets($fd); - myFlock($fd, LOCK_UN); - } - else { - if ( $debug > 1 ) { - echo _("Read cache num photos lock failed.") ."
"; - } - } - fclose($fd); - } - - return $numPhotos; + return $numPhotos; } function readCache( $cacheFilename, $start, $numPhotos ) { - global $arrPhotos, $debug; + global $arrPhotos; - $size = filesize($cacheFilename) + 1; - if ($fd = fs_fopen($cacheFilename, "rb")) { - if (myFlock($fd, LOCK_SH)) { - fgets($fd); - $posIndex = fgets($fd); - $posData = ftell($fd); - fseek( $fd, $posIndex + ($start * (CACHE_INDEX_FIELD_WIDTH + 1)), SEEK_CUR ); - $index = fgets($fd); - fseek( $fd, $posData + $index ); - - for ( $i = 0; $i < $numPhotos; ++$i ) { - $data = fgetcsv($fd,$size,'|'); - if ( $data ) { - if ( $debug > 1 ) { - echo sprintf(_("Album name : %s ; index: %s"), $data[0], $data[1]) ."
"; - } - $arrPhotos[$start+$i] = array("albumName" => $data[0], - "photoId" => $data[1], - "rating" => $data[2], - "ratingcount" => $data[3] ); - } - } - myFlock($fd, LOCK_UN); - } - else { - if ( $debug > 1 ) { - echo _("Read cache lock failed."). "
"; - } - } - fclose($fd); - } + $size = filesize($cacheFilename) + 1; + if ($fd = fs_fopen($cacheFilename, "rb")) { + if (myFlock($fd, LOCK_SH)) { + fgets($fd); + $posIndex = fgets($fd); + $posData = ftell($fd); + fseek( $fd, $posIndex + ($start * (CACHE_INDEX_FIELD_WIDTH + 1)), SEEK_CUR ); + $index = fgets($fd); + fseek( $fd, $posData + $index ); + + for ( $i = 0; $i < $numPhotos; ++$i ) { + $data = fgetcsv($fd,$size,'|'); + if ($data ) { + debugMessage(sprintf(_("Album name : %s ; index: %s"), $data[0], $data[1]), __FILE__, __LINE__, 1); + + $arrPhotos[$start+$i] = array("albumName" => $data[0], + 'photoId' => $data[1], + 'rating' => $data[2], + 'ratingcount' => $data[3] ); + } + } + myFlock($fd, LOCK_UN); + } + else { + debugMessage(_("Read cache lock failed."), __FILE__, __LINE__, 2); + } + fclose($fd); + } } function writeCache( $cacheFilename ) { - global $arrPhotos; + global $arrPhotos; - if ($fd = fs_fopen($cacheFilename, "wb")) { - if (myFlock($fd, LOCK_EX)) { - // Write the number of photos on the first line of the cache. - fwrite( $fd, sizeof($arrPhotos)); - fwrite( $fd, "\n" ); - - // Write a blank line to the cache. This will eventually be used to store a pointer to the index. - $fileSecondLine = ftell($fd); - $filepos = 0; - fwrite( $fd, sprintf("%".CACHE_INDEX_FIELD_WIDTH."d\n",$filepos)); - $index = ""; - - // Write data that is required to be cached. - for ($i = 0; $i < sizeof($arrPhotos); ++$i ) { - $photoInfo = $arrPhotos[$i]; - $lineout = $photoInfo['albumName']. "|". $photoInfo['photoId']. "|". $photoInfo['rating']. "|". $photoInfo['ratingcount']."\n"; - fwrite( $fd, $lineout); - $index = $index . sprintf("%".CACHE_INDEX_FIELD_WIDTH."d" ,$filepos) . "\n"; - $filepos += strlen($lineout); - } - - // Write the index to the end of the cache. - fwrite( $fd, $index ); - - // Move back to the second line and write a pointer to the index. - fseek( $fd, $fileSecondLine); - fwrite( $fd, sprintf("%".CACHE_INDEX_FIELD_WIDTH."d",$filepos)); - myFlock($fd, LOCK_UN); - } - else { - if ( $debug > 1 ) { - echo _("Read cache lock failed.") ."
"; - } - } - fclose($fd); - } -} - -function votesort($a, $b) { - global $retSortGreater, $retSortLesser; - if ($a['votes'] == $b['votes']) { - return 0; - } - return ($a['votes'] > $b['votes']) ? $retSortGreater : $retSortLesser; -} - -function ratingsort($a, $b) { - global $retSortGreater, $retSortLesser; - if ($a['rating'] == $b['rating']) { - return 0; - } - return ($a['rating'] > $b['rating']) ? $retSortGreater : $retSortLesser; -} - -function viewsort($a, $b) { - global $retSortGreater, $retSortLesser; - if ($a['views'] == $b['views']) { - return 0; - } - return ($a['views'] > $b['views']) ? $retSortGreater : $retSortLesser; -} - -function datesort($a, $b) { - global $retSortGreater, $retSortLesser; - if ($a['uploaddate'] == $b['uploaddate']) { - return 0; - } - return ($a['uploaddate'] > $b['uploaddate']) ? $retSortGreater : $retSortLesser; -} - -function commentdatesort($a, $b) { - global $retSortGreater, $retSortLesser; - if ($a['commentdate'] == $b['commentdate']) { - return 0; - } - return ($a['commentdate'] > $b['commentdate']) ? $retSortGreater : $retSortLesser; -} - -function capturedatesort($a, $b) { - global $retSortGreater, $retSortLesser; - - if($a['capturedate'] == $b['capturedate']) { - return 0; - } - - return ($a['capturedate'] > $b['capturedate']) ? $retSortGreater : $retSortLesser; -} - -function randomsort($a, $b) { - if ($a['random'] == $b['random']) { - return 0; - } - return ($a['random'] > $b['random']) ? -1 : 1; + if ($fd = fs_fopen($cacheFilename, "wb")) { + if (myFlock($fd, LOCK_EX)) { + // Write the number of photos on the first line of the cache. + fwrite( $fd, sizeof($arrPhotos)); + fwrite( $fd, "\n" ); + + // Write a blank line to the cache. This will eventually be used to store a pointer to the index. + $fileSecondLine = ftell($fd); + $filepos = 0; + fwrite( $fd, sprintf("%".CACHE_INDEX_FIELD_WIDTH."d\n",$filepos)); + $index = ""; + + // Write data that is required to be cached. + for ($i = 0; $i < sizeof($arrPhotos); ++$i ) { + $photoInfo = $arrPhotos[$i]; + $lineout = $photoInfo['albumName']. "|". $photoInfo['photoId']. "|". $photoInfo['rating']. "|". $photoInfo['ratingcount']."\n"; + fwrite( $fd, $lineout); + $index = $index . sprintf("%".CACHE_INDEX_FIELD_WIDTH."d" ,$filepos) . "\n"; + $filepos += strlen($lineout); + } + + // Write the index to the end of the cache. + fwrite( $fd, $index ); + + // Move back to the second line and write a pointer to the index. + fseek( $fd, $fileSecondLine); + fwrite( $fd, sprintf("%".CACHE_INDEX_FIELD_WIDTH."d",$filepos)); + myFlock($fd, LOCK_UN); + } + else { + debugMessage(_("Read cache lock failed."), __FILE__, __LINE__, 2); + } + fclose($fd); + } } function makeStatsUrl( $urlpage ) { - global $type, $period, $album, $thumbSize; - global $showCaption, $showAlbumLink, $showDescription; - global $showUploadDate, $showViews, $showVotes; -// global $showRatings; - global $showComments, $showCaptureDate; - global $showAddComment, $showAddVote, $showAlbumOwner, $showGrid, $numRows, $numCols; - global $photosPerPage, $totalPhotosReq, $reverseOrder; - global $timeMonth, $timeYear, $timeDay; - $urlParams = array( "type" => $type, - "page" => $urlpage, - "sca" => $showCaption, - "sal" => $showAlbumLink, - "sde" => $showDescription, - "sud" => $showUploadDate, - "svi" => $showViews, - "svo" => $showVotes, -// "sra" => $showRatings, - "sco" => $showComments, - "scd" => $showCaptureDate, - "sac" => $showAddComment, - "sav" => $showAddVote, - "sao" => $showAlbumOwner, - "sgr" => $showGrid, - "rev" => $reverseOrder, - "tsz" => $thumbSize, - "ppp" => $photosPerPage, - "rows" => $numRows, - "cols" => $numCols, - "total" => $totalPhotosReq); - if ( isset($period) ) { - $urlParams["period"] = $period; - } - if ( isset($album) ) { - $urlParams["album"] = $album; - } - if ( isset($timeYear) ) { - $urlParams["ty"] = $timeYear; - } - if ( isset($timeMonth) ) { - $urlParams["tm"] = $timeMonth; - } - if ( isset($timeDay) ) { - $urlParams["td"] = $timeDay; - } + global $type, $period, $album, $thumbSize; + global $showCaption, $showAlbumLink, $showDescription; + global $showUploadDate, $showViews, $showVotes; + // global $showRatings; + global $showComments, $showCaptureDate; + global $showAddComment, $showAddVote, $showAlbumOwner, $showGrid, $numRows, $cols; + global $photosPerPage, $totalPhotosReq, $reverse; + global $timeMonth, $timeYear, $timeDay; + $urlParams = array( "type" => $type, + "page" => $urlpage, + "sca" => $showCaption, + "sal" => $showAlbumLink, + "sde" => $showDescription, + "sud" => $showUploadDate, + "svi" => $showViews, + "svo" => $showVotes, + // "sra" => $showRatings, + "sco" => $showComments, + "scd" => $showCaptureDate, + "sac" => $showAddComment, + "sav" => $showAddVote, + "sao" => $showAlbumOwner, + "showGrid" => $showGrid, + "reverse" => $reverse, + "tsz" => $thumbSize, + "ppp" => $photosPerPage, + "rows" => $numRows, + "cols" => $cols, + "total" => $totalPhotosReq); + if (isset($period) ) { + $urlParams["period"] = $period; + } + if (isset($album) ) { + $urlParams["album"] = $album; + } + if (isset($timeYear) ) { + $urlParams["ty"] = $timeYear; + } + if (isset($timeMonth) ) { + $urlParams["tm"] = $timeMonth; + } + if (isset($timeDay) ) { + $urlParams["td"] = $timeDay; + } - $msStatsUrl = makeGalleryUrl( "stats.php", $urlParams); + $msStatsUrl = makeGalleryUrl( "stats.php", $urlParams); - return $msStatsUrl; + return $msStatsUrl; } // Get rating average value for all pics in statsalbum function getRatingAverage() { - global $statsAlbum; - $results=array(); - $ratings=array(); - $results_count=array(); - $nv_pairs=$statsAlbum->getVoteNVPairs(); - $voters=array(); - foreach ($statsAlbum->fields["votes"] as $element => $image_votes) { - $accum_votes=0; - $count=0; - foreach ($image_votes as $voter => $vote_value ) { - $voters[$voter]=true; - if ($vote_value> $statsAlbum->getPollScale()) { // scale has changed - $vote_value=$statsAlbum->getPollScale(); - } - $accum_votes+=$nv_pairs[$vote_value]["value"]; - $count++; - } - if ($accum_votes > 0) { - $results_count[$element]=$count; - if ($statsAlbum->getPollType() == "rank" || $statsAlbum->getPollScale() == 1) { - $results[$element]=$accum_votes; - } - else { - $results[$element]=number_format(((double)$accum_votes)/$count, 2); - } - } - else { - $results[$element] = 0; - } - $index = $statsAlbum->getIndexByVotingId($element); - $ratings[$index] = array('average' => $results[$element], 'count' => $count); - } - return $ratings; + global $statsAlbum; + $results=array(); + $ratings=array(); + $results_count=array(); + $nv_pairs=$statsAlbum->getVoteNVPairs(); + $voters=array(); + foreach ($statsAlbum->fields["votes"] as $element => $image_votes) { + $accum_votes=0; + $count=0; + foreach ($image_votes as $voter => $vote_value ) { + $voters[$voter]=true; + if ($vote_value> $statsAlbum->getPollScale()) { // scale has changed + $vote_value=$statsAlbum->getPollScale(); + } + $accum_votes+=$nv_pairs[$vote_value]["value"]; + $count++; + } + if ($accum_votes > 0) { + $results_count[$element]=$count; + if ($statsAlbum->getPollType() == "rank" || $statsAlbum->getPollScale() == 1) { + $results[$element]=$accum_votes; + } + else { + $results[$element]=number_format(((double)$accum_votes)/$count, 2); + } + } + else { + $results[$element] = 0; + } + $index = $statsAlbum->getIndexByVotingId($element); + $ratings[$index] = array('average' => $results[$element], 'count' => $count); + } + return $ratings; } // Show the add comment link function showAddCommentLink( $photoId ) { - global $statsAlbum; + global $statsAlbum; - $url = "add_comment.php?set_albumName={$statsAlbum->fields['name']}&id=$photoId"; - echo '' . - popup_link('[' . _("add comment") . ']', $url, 0) . - ""; + $url = "add_comment.php?set_albumName={$statsAlbum->fields['name']}&id=$photoId"; + return '' . popup_link('[' . _("add comment") . ']', $url, 0) . ""; } // Show the add vote link function showAddVoteLink( $photoId, $page ) { - global $statsAlbum; + global $statsAlbum; + + $urlargs['set_albumName'] = $statsAlbum->fields['name']; + $urlargs['id'] = $photoId; + $urlargs['url'] = urlencode(makeStatsUrl( $page )); + + $addVoteLink = ''; + $addVoteLink .= ''; + $addVoteLink .= "[". _("add vote") ."]"; + $addVoteLink .= ""; - $urlargs['set_albumName'] = $statsAlbum->fields['name']; - $urlargs['id'] = $photoId; - $urlargs['url'] = urlencode(makeStatsUrl( $page )); - echo ''; - echo ''; - echo "[". _("add vote") ."]"; - echo ""; + return $addVoteLink; } + function getHeightFromTag($str) { - $start = 'height="'; - $end = '" border'; - $lenStr= strpos($str,$end) -strpos($str, $start); - return substr(substr($str, strpos($str,$start), $lenStr), 8); + $start = 'height="'; + $end = '" border'; + $lenStr= strpos($str,$end) -strpos($str, $start); + return substr(substr($str, strpos($str,$start), $lenStr), 8); } function getWidthFromTag($str) { - $start = 'width="'; - $end = '" height='; - $lenStr= strpos($str,$end) -strpos($str, $start); - return substr(substr($str, strpos($str,$start), $lenStr), 7); + $start = 'width="'; + $end = '" height="'; + $lenStr= strpos($str,$end) -strpos($str, $start); + return substr(substr($str, strpos($str,$start), $lenStr), 7); +} + +function showAddVoteAddCommentLinks($photoId, $page) { + global $showAddComment, $showAddVote; + $text = ''; + + if ($showAddComment || $showAddVote) { + $text = ' '; + if ($showAddComment) { + $text .= showAddCommentLink($photoId); + } + if ($showAddVote) { + $text .= " "; + $text .= showAddVoteLink($photoId, $page); + } + $text .= ''; + } + return $text; } function displayTextCell($statsAlbum, $photoIndex, $photoId, $rating, $ratingcount ) { - global $addLinksPos, $showAddComment, $showAddVote, $page, $showAlbumOwner, $showCaptureDate, $showUploadDate; - global $showViews, $gallery, $showVotes; -// global $showRatings; - global $showComments, $newestCommentsFirst; - global $showCaption, $showAlbumLink, $showDescription, $showGrid, $imageCellWidth; - - if ( $showGrid ) { - $statsAlign = "center"; - $statsWidth = $statsAlbum->fields['thumb_size']; - } - else { - $statsAlign = "left"; - $statsWidth = "100%"; - } -?> - - -setAttrs(array( + 'width' => '100%', + 'border' => 0, + 'cellspacing' => 0, + 'cellpadding' => 0, + 'class' => 'mod_title')); + + $statsCaption = $statsAlbum->getCaption($photoIndex); + $statsCaption .= $statsAlbum->getCaptionName($photoIndex); + $statsUrl = makeAlbumUrl($statsAlbum->fields['name'], $photoId); + + $captionText = ''. $statsCaption .'  '; + + if ($addLinksPos == 'oncaptionline' ) { + $captionText .= showAddVoteAddCommentLinks($photoId, $page); + } + + $captionTextTable = new galleryTable(); + $captionTextTable->setAttrs(array( + 'border' => 0, + 'cellspacing' => 0, + 'cellpadding' => 0, + 'class' => 'mod_title_bg')); + + $captionTextTable->addElement(array( + 'content' => '', + 'cellArgs' => array('class' => 'mod_title_left', 'align' => 'right'))); + $captionTextTable->addElement(array( + 'content' => $captionText, + 'cellArgs' => array('class' => 'title', 'align' => 'left'))); + $captionTextTable->addElement(array( + 'content' => '', + 'cellArgs' => array('class' => 'mod_title_right', 'align' => 'left'))); + + $captionTable->addElement(array( + 'content' => $captionTextTable->render(2), + 'cellArgs' => '')); + + $html = $captionTable->render(1); + } + + // End Caption + + if ($showAlbumLink ) { + $albumLink = sprintf(_("From album: %s"), + ''. $statsAlbum->fields['title'] . ''); + + $owner_var = ''; + if ($showAlbumOwner == 1 ) { + $owner_var = '
' . sprintf(_("Owned by: %s"), showOwner($statsAlbum->getOwner())); + } + + $html .= "\n " . '

'. $albumLink . $owner_var . '
'; + } + + if ($showDescription) { + $description = $statsAlbum->getExtraField($photoIndex, "Description"); + if ($description != "") { + $html .= "\n ". '
'. $description .'
'; + } + } + + if ($addLinksPos == 'abovestats' ) { + $html .= showAddVoteAddCommentLinks($photoId, $page); + } + + /* Begin Inner Stats */ + + $innerStatsTable = new galleryTable(); + $innerStatsTable->setAttrs(array( + 'border' => 0, + 'cellspacing' => 0, + 'cellpadding' => 0, + 'class' => 'fineprint')); + + $innerStatsTable->setColumnCount(2); + + if ($showCaptureDate ) { + $captureDate = strftime($gallery->app->dateTimeString, $statsAlbum->getItemCaptureDate($photoIndex)); + + $innerStatsTable->addElement(array( + 'content' => _("Capture Date:"), + 'cellArgs' => array('width' => 100))); + + $innerStatsTable->addElement(array( + 'content' => $captureDate, + 'cellArgs' => array('class' => 'fineprint'))); + } + + if ($showUploadDate ) { + $time = $statsAlbum->getUploadDate($photoIndex); + // Older albums may not have this field. + if ($time) { + $time = strftime($gallery->app->dateString,$time); + $innerStatsTable->addElement(array( + 'content' => _("Upload Date:"), + 'cellArgs' => array('width' => 100))); + + $innerStatsTable->addElement(array( + 'content' => $time, + 'cellArgs' => array('class' => 'fineprint'))); + } + } + + if ($showViews && + ($statsAlbum->fields["display_clicks"] == 'yes' || $gallery->user->isAdmin()) && + !$gallery->session->offline) { + + $innerStatsTable->addElement(array( + 'content' => _("Views:"), + 'cellArgs' => array('width' => 100))); + + $innerStatsTable->addElement(array( + 'content' => pluralize_n2($statsAlbum->getItemClicks($photoIndex), "1 time", "times" , "0 times"), + 'cellArgs' => array('class' => 'fineprint'))); + } + + if (!empty($showVotes )) { + $innerStatsTable->addElement(array( + 'content' => _("Votes:"), + 'cellArgs' => array('width' => 100))); + + $innerStatsTable->addElement(array( + 'content' => $statsAlbum->getItemSVotes($photoIndex), + 'cellArgs' => array('class' => 'fineprint'))); + } + + if (!empty($showRatings)) { + switch ($rating) { + case -2: + $photoRateCounts = ''; + $photoRate = _("not rated"); + break; + case -1: + $photoRateCounts = ''; + $photoRate = $ratingcount; + $photoRate .= $ratingcount == 1 ? " vote" : " votes"; + $photoRate .= ' cast, more required'; + break; + default: + $photoRateCounts = $ratingcount == 1 ? " (".$ratingcount." vote)" : " (".$ratingcount." votes)"; + $photoRate = $rating; + } + + $innerStatsTable->addElement(array( + 'content' => _("Rating:"), + 'cellArgs' => array('width' => 100))); + + $innerStatsTable->addElement(array( + 'content' => $photoRate .' | '. $photoRateCounts, + 'cellArgs' => array('class' => 'fineprint'))); + } + + $html .= $innerStatsTable->render(1); + // End Innerstats + + if ($addLinksPos == 'abovecomments' ) { + $html .= showAddVoteAddCommentLinks($photoId, $page); + } + + if ($showComments && + $statsAlbum->numComments($photoIndex) > 0 && + $statsAlbum->canViewComments($gallery->user->getUid()) ) { + + $gallery->album = $statsAlbum; + $html .= '
'. showComments($photoIndex, $statsAlbum->fields['name']); + } + + if ($addLinksPos == 'belowcomments' ) { + $html .= showAddVoteAddCommentLinks($photoId, $page); + } -if ( $showCaption && !$showGrid ) { -?> - - - - - -
- - - - - - - -
-getCaption($photoIndex); - $statsCaption .= $statsAlbum->getCaptionName($photoIndex); - $statsUrl = makeAlbumUrl($statsAlbum->fields['name'], $photoId); - echo ''. $statsCaption .'  '; - if ( $addLinksPos == 'oncaptionline' ) { - echo '  '; - if ( $showAddComment ) { - showAddCommentLink( $photoId ); - } - if ( $showAddVote ) { - echo " "; - showAddVoteLink( $photoId, $page ); - } - echo ''; -} - -?> -
-
- - - - -
-fields['thumb_size'] . '" border="0" cellpadding="0" cellspacing="4">'; - echo ''; - - $statsCaption = $statsAlbum->getCaption($photoIndex); - $statsCaption .= $statsAlbum->getCaptionName($photoIndex); - $statsUrl = makeAlbumUrl($statsAlbum->fields['name'], $photoId); - echo "$statsCaption"; - if ( $addLinksPos == 'oncaptionline' ) { - echo '  '; - if ( $showAddComment ) { - showAddCommentLink( $photoId ); - } - if ( $showAddVote ) { - echo ' '; - showAddVoteLink( $photoId, $page ); - } - echo ''; - } - echo ''; -} - -if ( $showAlbumLink ) { -?> -
-' . _("Owned by:") . ' ' . showOwner($statsAlbum->getOwner()); -} - -echo ''. $statsAlbum->fields['title'] .''. $owner_var; -?> - -
- - -getExtraField($photoIndex, "Description"); -if ($description != "") { - echo "
$description
"; -} -?> - - -"; - showAddCommentLink( $photoId ); - if ( !$showAddVote ) { - echo "
"; - } - } - - if ( $showAddVote ) { - if ( !$showAddComment ) { - echo "
"; - } - else { - echo "  "; - } - showAddVoteLink( $photoId, $page ); - echo "
"; - } -} -?> -
- - -app->dateTimeString, $statsAlbum->getItemCaptureDate($photoIndex)); - - echo ''; - echo ''; - echo ''; - echo ''; -} - -if ( $showUploadDate ) { - $time = $statsAlbum->getUploadDate($photoIndex); - // Older albums may not have this field. - if ($time) { - $time = strftime($gallery->app->dateString,$time); - echo ''; - echo ''; - echo ''; - echo ''; - } -} - -if ( $showViews && -!($statsAlbum->fields["display_clicks"] == "no") && -!$gallery->session->offline) { - - echo "\n"; - echo "\n\t". ''; - echo "\n\t". '"; - echo "\n"; -} - -if ( !empty($showVotes )) { - echo "\n"; - echo "\n\t". ''; - echo "\n\t". ''; - echo "\n"; -} - -if ( !empty($showRatings)) { - switch ($rating) { - case -2: - $photoRateCounts = ''; - $photoRate = _("not rated"); - break; - case -1: - $photoRateCounts = ''; - $photoRate = $ratingcount; - $photoRate .= $ratingcount == 1 ? " vote" : " votes"; - $photoRate .= ' cast, more required'; - break; - default: - $photoRateCounts = $ratingcount == 1 ? " (".$ratingcount." vote)" : " (".$ratingcount." votes)"; - $photoRate = $rating; - } - - if ( $showGrid ) { - echo ""; - echo ''; - echo ''; - echo ""; - - echo ""; - echo ''; - echo ''; - echo ""; - } - else { - echo ""; - echo ''; - echo '"; - echo ""; - } -} - -echo "
'. _("Capture Date:") .''. $captureDate .'
'. _("Upload Date:") .''. $time. '
'. _("Views:") .''; - echo pluralize_n2($statsAlbum->getItemClicks($photoIndex), "1 time", "times" , "0 times"); - echo "
' . _("Votes:") .''. $statsAlbum->getItemSVotes($photoIndex) .'
'. _("Rating:") .''. $photoRate .'
'. $photoRateCounts .'
'. _("Rating:") .'' .$photoRate.$photoRateCounts; - echo "
"; - -if ( $addLinksPos == 'abovecomments' ) { - if ( $showAddComment ) { - echo "
"; - if ( !$showGrid ) { - echo "
"; - } - showAddCommentLink( $photoId ); - } - - if ( $showAddVote ) { - if ( !$showAddComment ) { - echo "
"; - if ( !$showGrid ) { - echo "
"; - } - } - else - echo "  "; - showAddVoteLink( $photoId, $page ); - } -} - -if ( $showComments && -$statsAlbum->numComments($photoIndex) > 0 && -$statsAlbum->canViewComments($gallery->user->getUid()) ) { - // Force the comment table below the previous table using clear all. - echo "
"; - if ( !$showGrid ) { - echo "
"; - } - $gallery->album = $statsAlbum; - viewComments($photoIndex, $gallery->user->canAddComments($statsAlbum), "DISCO1", $newestCommentsFirst, 'popup', $statsAlbum->fields['name']); -} - -if ( $addLinksPos == 'belowcomments' ) { - if ( $showAddComment ) { - echo "
"; - if ( !$showGrid ) { - echo "
"; - } - showAddCommentLink( $photoId ); - } - if ( $showAddVote ) { - if ( !$showAddComment ) { - echo "
"; - if ( !$showGrid ) { - echo "
"; - } - } - else { - echo "  "; - } - showAddVoteLink( $photoId, $page ); - } -} -?> - - - diff -Naur gallery-1.5-pl1/stats-wizard.php gallery-1.5.1/stats-wizard.php --- gallery-1.5-pl1/stats-wizard.php 2005-04-04 17:26:07.000000000 +0200 +++ gallery-1.5.1/stats-wizard.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: stats-wizard.php,v 1.4.2.3 2005/04/04 15:26:07 cryptographite Exp $ + * $Id: stats-wizard.php,v 1.9.2.2 2005/09/12 22:40:44 dmolavi Exp $ * */ ?> @@ -40,16 +40,34 @@ ?> -<?php echo $gallery->app->galleryTitle ?> +<?php echo $gallery->app->galleryTitle ?>::<?php echo _("Gallery statistics - Wizard") ?> - + '. _("Gallery statistics - Wizard") .''; + $adminCommands = '['. _("return to admin page") .'] '; + $adminCommands .= '['. _("return to gallery") .'] '; + + $adminbox["commands"] = $adminCommands; + $adminbox["bordercolor"] = $gallery->app->default["bordercolor"]; + $breadcrumb['text'][] = languageSelector(); + + includeLayout('navtablebegin.inc'); + includeLayout('adminbox.inc'); + includeLayout('navtablemiddle.inc'); + includeLayout('breadcrumb.inc'); + includeLayout('navtableend.inc'); + +?> +
+ -
[]
- "stats_form", - "method" => "POST", + "method" => "POST", "onChange" => 'updateUrl()')); echo "\n"; echo "\n"; @@ -127,12 +143,21 @@ echo "\n". ''; echo "\n"; + echo "\n". '
'; echo _("Maybe your want to use your OWN statistics somewhere .. Just copy and paste the url from this textbox."); echo "\n
". '
'; - echo "\n". '"; echo "\n"; - +?> + +
+ diff -Naur gallery-1.5-pl1/tools/build_manifest.php gallery-1.5.1/tools/build_manifest.php --- gallery-1.5-pl1/tools/build_manifest.php 2005-03-10 03:36:37.000000000 +0100 +++ gallery-1.5.1/tools/build_manifest.php 2005-09-13 00:41:29.000000000 +0200 @@ -16,9 +16,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: build_manifest.php,v 1.12.2.1 2005/03/10 02:36:37 cryptographite Exp $ + * $Id: build_manifest.php,v 1.13.2.1 2005/09/12 22:41:29 dmolavi Exp $ */ /* diff -Naur gallery-1.5-pl1/tools/despam-comments.php gallery-1.5.1/tools/despam-comments.php --- gallery-1.5-pl1/tools/despam-comments.php 2005-04-04 18:07:50.000000000 +0200 +++ gallery-1.5.1/tools/despam-comments.php 2005-09-13 00:41:29.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: despam-comments.php,v 1.13.2.3 2005/04/04 16:07:50 cryptographite Exp $ + * $Id: despam-comments.php,v 1.18.2.1 2005/09/12 22:41:29 dmolavi Exp $ * * The idea for this was blatantly lifted from Jay Allen's most excellent * MT-Blacklist, a plugin for MovableType that helps kill spam dead. No code @@ -50,22 +50,23 @@ -

-'. _("return to admin page") .'] '; -$adminCommands .= '['. _("return to gallery") .'] '; - -$adminbox["commands"] = $adminCommands; -$adminbox["bordercolor"] = $gallery->app->default["bordercolor"]; -includeLayout('adminbox.inc'); -includeLayout('ml_pulldown.inc'); - + includeHtmlWrap("gallery.header"); + $adminbox['text'] =''. _("Find and remove comment spam") .''; + $adminCommands = '['. _("return to admin page") .'] '; + $adminCommands .= '['. _("return to gallery") .'] '; + + $adminbox["commands"] = $adminCommands; + $adminbox["bordercolor"] = $gallery->app->default["bordercolor"]; + $breadcrumb['text'][] = languageSelector(); + + includeLayout('navtablebegin.inc'); + includeLayout('adminbox.inc'); + includeLayout('navtablemiddle.inc'); + includeLayout('breadcrumb.inc'); + includeLayout('navtableend.inc'); ?> -
+
+
'; @@ -74,7 +75,7 @@ $g1_mode=getRequestVar('g1_mode'); -echo ""; -echo '
'; +echo "
"; ?>
"; +echo ''; switch($g1_mode) { case 'deleteComments': deleteComments(); @@ -103,17 +104,17 @@ default: break; } -echo "
-
-
- -
+
+ -%s", _("No spam comments.")); } else { - print makeFormIntro("tools/despam-comments.php", array("method" => "POST")); + print makeFormIntro("tools/despam-comments.php", array("name" => "deleteComments", "method" => "POST")); print "\n"; printf("\n\t", _("Entry"), _("Delete")); @@ -334,26 +335,36 @@ } function viewBlacklist() { - $blacklist = loadBlacklist(); - printf("

%s (%d)

", _("Current blacklist"), sizeof($blacklist['entries'])); - if (empty($blacklist['entries'])) { - print _("Your blacklist is empty. You must add new entries to your blacklist for it to be useful."); - } else { - print makeFormIntro("tools/despam-comments.php", array("method" => "POST")); - print "\n
%s %s
"; - printf("\n\t", ("Entry"), _("Delete")); - $i = 0; - foreach ($blacklist['entries'] as $key => $regex) { - $i++; - print "\n\t"; - printf("", wordwrap($regex, 80, "
", true)); - printf("", $key); - print ""; - } - print "\n
%s%s
%s

"; - print "\n"; - printf("\n", _("Update Blacklist")); - print "\n"; + $blacklist = loadBlacklist(); + printf("

%s (%d)

", _("Current blacklist"), sizeof($blacklist['entries'])); + if (empty($blacklist['entries'])) { + print _("Your blacklist is empty. You must add new entries to your blacklist for it to be useful."); + } else { + echo insertFormJS('updateBlacklistForm'); + + print makeFormIntro("tools/despam-comments.php", array('name' => 'updateBlacklistForm', 'method' => 'POST')); + $blacklistTable = new galleryTable(); + $blacklistTable->setAttrs(array('align' => 'center', 'width' => '60%')); + $blacklistTable->setHeaders(array(_("Entry"), _("Delete"))); + $blacklistTable->setColumnCount(2); + + foreach ($blacklist['entries'] as $key => $regex) { + $blacklistTable->addElement(array( + 'content' => wordwrap($regex, 80, "
", true))); + + $blacklistTable->addElement(array( + 'content' => '', + 'cellArgs' => array('align' => 'center'))); + } + $blacklistTable->addElement(array( + 'content' => insertFormJSLinks('delete[]'), + 'cellArgs' => array('colspan' => 2, 'align' => 'center'))); + + echo $blacklistTable->render(); + + print "\n"; + printf("\n", _("Update Blacklist")); + print "\n"; } } @@ -380,14 +391,13 @@ "addBlacklistEntries" => _("Add blacklist entries") ); - printf("\n
%s", _("Options")); - print "\n
    "; + echo _("Options"); + echo "\n
      "; foreach ($options as $key => $text) { printf("\n\t
    1. %s
      2. ", makeGalleryUrl('tools/despam-comments.php', array('g1_mode' => $key)), $text); } - print "\n
    "; - print "\n
"; + echo "\n"; } ?> diff -Naur gallery-1.5-pl1/tools/find_orphans.php gallery-1.5.1/tools/find_orphans.php --- gallery-1.5-pl1/tools/find_orphans.php 2005-03-10 03:36:37.000000000 +0100 +++ gallery-1.5.1/tools/find_orphans.php 2005-09-13 00:41:29.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: find_orphans.php,v 1.21.2.2 2005/03/10 02:36:37 cryptographite Exp $ + * $Id: find_orphans.php,v 1.24.2.1 2005/09/12 22:41:29 dmolavi Exp $ */ ?> direction ?>"> -
-'. _("return to admin page") .'] '; -$adminCommands .= '['. _("return to gallery") .'] '; - -$adminbox["commands"] = $adminCommands; -$adminbox["bordercolor"] = $gallery->app->default["bordercolor"]; -includeLayout('adminbox.inc'); -includeLayout('ml_pulldown.inc'); + includeHtmlWrap("gallery.header"); + $adminbox['text'] =''. _("Find Orphans") .''; + $adminCommands = '['. _("return to admin page") .'] '; + $adminCommands .= '['. _("return to gallery") .'] '; + + $adminbox["commands"] = $adminCommands; + $adminbox["bordercolor"] = $gallery->app->default["bordercolor"]; + $breadcrumb['text'][] = languageSelector(); + + includeLayout('navtablebegin.inc'); + includeLayout('adminbox.inc'); + includeLayout('navtablemiddle.inc'); + includeLayout('breadcrumb.inc'); + includeLayout('navtableend.inc'); echo '
'; if (empty($action)) { @@ -293,7 +295,7 @@ } else { // No Orphans echo "\n

" . _("No Orphans Found") . "

"; - echo "\n

". _("There are no orphaned elements in this Gallery.") . "

"; + echo "\n

". _("There are no orphaned elements in this Gallery.") . "

\n"; } } // !isset(update) else { @@ -315,11 +317,12 @@ } } } - - includeHtmlWrap("gallery.footer"); -if (!$GALLERY_EMBEDDED_INSIDE) { ?>
+ diff -Naur gallery-1.5-pl1/tools/g1-report.php gallery-1.5.1/tools/g1-report.php --- gallery-1.5-pl1/tools/g1-report.php 2005-03-10 03:36:37.000000000 +0100 +++ gallery-1.5.1/tools/g1-report.php 2005-09-13 00:41:29.000000000 +0200 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ /* diff -Naur gallery-1.5-pl1/tools/validate_albums.php gallery-1.5.1/tools/validate_albums.php --- gallery-1.5-pl1/tools/validate_albums.php 2005-04-04 18:08:02.000000000 +0200 +++ gallery-1.5.1/tools/validate_albums.php 2005-09-13 00:41:29.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: validate_albums.php,v 1.1.2.3 2005/04/04 16:08:02 cryptographite Exp $ + * $Id: validate_albums.php,v 1.4.2.1 2005/09/12 22:41:29 dmolavi Exp $ */ ?> - + '. ($action == 'unlinkInvalidAlbum') ? _("Delete Album") : _("Delete Photo") .''; + $adminCommands = '['. _("return to admin page") .'] '; + $adminCommands .= '['. _("return to gallery") .'] '; + + $adminbox["commands"] = $adminCommands; + $adminbox["bordercolor"] = $gallery->app->default["bordercolor"]; + $breadcrumb['text'][] = languageSelector(); + + includeLayout('navtablebegin.inc'); + includeLayout('adminbox.inc'); + includeLayout('navtablemiddle.inc'); + includeLayout('breadcrumb.inc'); + includeLayout('navtableend.inc'); + ?> -
app->albumDir . '/' . $invalidAlbum); dismiss(); } else { - echo makeFormIntro('tools/validate_albums.php', array(), array('action' => $action, 'invalidAlbum' => -$invalidAlbum)); + echo makeFormIntro('tools/validate_albums.php', array(), array('action' => $action, 'invalidAlbum' => $invalidAlbum)); echo "

"; echo ""; } @@ -159,8 +173,7 @@ $targetAlbum->save(array(i18n("Photo $id deleted from $album because the target image file is missing"))); dismiss(); } else { - echo makeFormIntro('tools/validate_albums.php', array(), array('action' => $action, 'album' => $album, -'id' => $id)); + echo makeFormIntro('tools/validate_albums.php', array(), array('action' => $action, 'album' => $album, 'id' => $id)); $targetAlbum = new Album(); $targetAlbum->load($album); echo $targetAlbum->getThumbnailTagById($id); @@ -192,21 +205,24 @@ common_header(); ?> - + -
-'. _("return to admin page") .'] '; -$adminCommands .= '['. _("return to gallery") .'] '; + includeHtmlWrap("gallery.header"); + $adminbox['text'] =''. _("Validate Albums") .''; + $adminCommands = '['. _("return to admin page") .'] '; + $adminCommands .= '['. _("return to gallery") .'] '; + + $adminbox["commands"] = $adminCommands; + $adminbox["bordercolor"] = $gallery->app->default["bordercolor"]; + $breadcrumb['text'][] = languageSelector(); + + includeLayout('navtablebegin.inc'); + includeLayout('adminbox.inc'); + includeLayout('navtablemiddle.inc'); + includeLayout('breadcrumb.inc'); + includeLayout('navtableend.inc'); -$adminbox["commands"] = $adminCommands; -$adminbox["bordercolor"] = $gallery->app->default["bordercolor"]; -includeLayout('adminbox.inc'); -includeLayout('ml_pulldown.inc'); echo '
'; if (empty($action)) { @@ -290,11 +306,12 @@ +
+ -
diff -Naur gallery-1.5-pl1/upgrade_album.php gallery-1.5.1/upgrade_album.php --- gallery-1.5-pl1/upgrade_album.php 2005-03-10 03:29:37.000000000 +0100 +++ gallery-1.5.1/upgrade_album.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: upgrade_album.php,v 1.40.2.2 2005/03/10 02:29:37 cryptographite Exp $ + * $Id: upgrade_album.php,v 1.42.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> user->isAdmin() ? true : false; $allowChange["email"] = true; $allowChange["fullname"] = true; -$allowChange["password"] = true; $allowChange["old_password"] = true; $allowChange["default_language"] = true; $allowChange["send_email"] = false; $allowChange["member_file"] = false; $allowChange["create_albums"] = false; +$allowChange["password"] = $gallery->user->canChangeOwnPw() ? true : false; +$allowChange["admin"] = true; + +$isAdmin = $gallery->user->isAdmin() ? 1 : 0; doctype(); ?> diff -Naur gallery-1.5-pl1/util.php gallery-1.5.1/util.php --- gallery-1.5-pl1/util.php 2005-08-24 05:20:12.000000000 +0200 +++ gallery-1.5.1/util.php 2005-09-15 15:34:44.000000000 +0200 @@ -15,70 +15,77 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: util.php,v 1.498.2.9 2005/08/24 03:20:12 cryptographite Exp $ + * $Id: util.php,v 1.537.2.10 2005/09/15 13:34:44 jenst Exp $ + */ + +/** + * @package Utils */ -?> -album->numComments($index); + $html = ''; + + /* $borderColor = $gallery->app->default["bordercolor"]; $commentdraw["bordercolor"] = $borderColor; + */ + echo showComments($index, $album, $newestFirst); - if ($newestFirst) { - for ($i = $numComments; $i >0 ; $i--) { - // get comments in this loop and then use layout/commentdraw.inc to display - $comment = $gallery->album->getComment($index, $i); - $commentdraw["comment"] = $comment->getCommentText(); - $commentdraw["IPNumber"] = $comment->getIPNumber(); - $commentdraw["datePosted"] = $comment->getDatePosted(); - $commentdraw["name"] = $comment->getName(); - $commentdraw["UID"] = $comment->getUID(); - $commentdraw["index"] = $index; - $commentdraw["albumName"] = $album; - includeLayout('commentdraw.inc'); - } - } else { - for ($i =1; $i<= $numComments; $i++) { - // get comments in this loop and then use layout/commentdraw.inc to display - $comment = $gallery->album->getComment($index, $i); - $commentdraw["comment"] = $comment->getCommentText(); - $commentdraw["IPNumber"] = $comment->getIPNumber(); - $commentdraw["datePosted"] = $comment->getDatePosted(); - $commentdraw["name"] = $comment->getName(); - $commentdraw["UID"] = $comment->getUID(); - $commentdraw["index"] = $index; - $commentdraw["albumName"] = $album; - includeLayout('commentdraw.inc'); - } - } - if ($addComments) { - /* Default is the popup link. + /* Default is the popup link. ** addType given through function call overrides default. */ if (empty($addType)) { @@ -182,20 +164,19 @@ } else { $id = $gallery->album->getPhotoId($index); - $url = "add_comment.php?set_albumName={$gallery->album->fields['name']}&id=$id"; - echo "\n" .'
' . - popup_link('[' . _("add comment") . ']', $url, 0) . - '

'; + $url = "add_comment.php?set_albumName={$gallery->album->fields['name']}&id=$id"; + echo "\n" .'
' . + popup_link('[' . _("add comment") . ']', $url, 0) . + '

'; } - } - + } } -function drawCommentAddForm($commenter_name='', $cols=50) { +function drawCommentAddForm($commenter_name = '', $cols = 50) { global $gallery; if ($gallery->user->isLoggedIn() ) { if (empty($commenter_name) || $gallery->app->comments_anonymous == 'no') { - $commenter_name=user_name_string($gallery->user->getUID(), $gallery->app->comments_display_name); + $commenter_name = user_name_string($gallery->user->getUID(), $gallery->app->comments_display_name); } } ?> @@ -207,16 +188,17 @@ user->isLoggedIn() ) { - echo ""; - } else { - if ($gallery->app->comments_anonymous == 'yes') { - echo ''; - } else { - echo $commenter_name; - echo ''; - } - } + +if (!$gallery->user->isLoggedIn() ) { + echo ""; +} else { + if ($gallery->app->comments_anonymous == 'yes') { + echo ''; + } else { + echo $commenter_name; + echo ''; + } +} ?> @@ -274,11 +256,6 @@ return false; } - -function gallery_error($message) { - return ''. _("Error:") . " $message\n"; -} - function gallery_syslog($message) { global $gallery; if (isset($gallery->app->useSyslog) && $gallery->app->useSyslog == "yes") { @@ -297,8 +274,8 @@ $results=array(); if (isDebugging()) { - print "\n
". _("Executing:") .""; - $debugfile = tempnam($gallery->app->tmpDir, "dbg"); + debugMessage(sprintf(_("Executing: %s"), $cmd), __FILE__, __LINE__); + $debugfile = tempnam($gallery->app->tmpDir, "dbg"); } fs_exec($cmd, $results, $status, $debugfile); @@ -332,31 +309,27 @@ } function exec_wrapper($cmd) { - global $gallery; + global $gallery; - list($results, $status) = exec_internal($cmd); + list($results, $status) = exec_internal($cmd); - if ($status == $gallery->app->expectedExecStatus) { - return 0; - } else { - if ($results) { - echo gallery_error(join("
", $results)); - } - return 1; + if ($status == $gallery->app->expectedExecStatus) { + return true; + } else { + if ($results) { + echo gallery_error(join("
", $results)); } + return false; + } } function getDimensions($file, $regs=false) { global $gallery; - if (isDebugging()) { - processingMsg(sprintf(_("Getting Dimension of file: %s"), $file)); - } + debugMessage(sprintf(_("Getting Dimension of file: %s"), $file), __FILE__, __LINE__,2); if (! fs_file_exists($file)) { - if (isDebugging()) { - processingMsg(_("The file does not exist ?!")); - } + debugMessage(_("The file does not exist ?!"), __FILE__, __LINE__); return array(0, 0); } if ($regs === false) { @@ -366,9 +339,8 @@ if (($regs[0] > 1) && ($regs[1] > 1)) { return array($regs[0], $regs[1]); } - elseif (isDebugging()) { - processingMsg(sprintf(_("PHP's %s unable to determine dimensions."), "getimagesize()")); - } + + debugMessage(sprintf(_("PHP's %s unable to determine dimensions."), "getimagesize()"), __FILE__, __LINE__); /* Just in case php can't determine dimensions. */ switch($gallery->app->graphics) { @@ -382,10 +354,8 @@ break; default: - if (isDebugging()) { - processingMsg(_("You have no graphics package configured for use!")); - return array(0, 0); - } + echo debugMessage(_("You have no graphics package configured for use!")); + return array(0,0); break; } @@ -407,9 +377,7 @@ } } - if (isDebugging()) { - processingMsg(_("Unable to determine image dimensions!")); - } + debugMessage(_("Unable to determine image dimensions!"), __FILE__, __LINE__); return array(0, 0); } @@ -419,7 +387,7 @@ } function acceptableFormatRegexp() { - return "(" . join("|", acceptableFormatList()) . ")"; + return "(?:" . join("|", acceptableFormatList()) . ")"; } function acceptableMovieList() { @@ -501,17 +469,16 @@ } function dismiss() { - echo(""); + echo(""); } function my_flush() { - print str_repeat(" ", 4096); // force a flush + print str_repeat(" ", 4096); // force a flush } -function resize_image($src, $dest, $target=0, $target_fs=0, $keepProfiles=0) { - if (isDebugging()) { - processingMsg(sprintf(_("Resizing Image: %s"), $src)); - } +function resize_image($src, $dest, $target = 0, $target_fs = 0, $keepProfiles = 0) { + + debugMessage(sprintf(_("Resizing Image: %s"), $src), __FILE__, __LINE__); /* * Valid return codes: @@ -519,16 +486,16 @@ * 1: File resized, process normally * 2: Existing resized file should be removed */ - global $gallery; + global $gallery; - if (!strcmp($src,$dest)) { - $useTemp = true; - $out = "$dest.tmp"; - } - else { - $out = $dest; - $useTemp = false; - } + if (!strcmp($src,$dest)) { + $useTemp = true; + $out = "$dest.tmp"; + } + else { + $out = $dest; + $useTemp = false; + } $regs = getimagesize($src); if ($regs[2] !== 2 && $regs[2] !== 3) { @@ -703,8 +670,7 @@ } break; default: - if (isDebugging()) - echo "
". _("You have no graphics package configured for use!") ."
"; + echo debugMessage(_("You have no graphics package configured for use!")); return 0; } } else { @@ -796,25 +762,20 @@ $wmAlignY = floor($wmAlignY); // Build command lines arguements - switch($gallery->app->graphics) - { - case "ImageMagick": - $args = "-geometry +".$wmAlignX."+"."$wmAlignY $overlayFile $src $out"; - break; - case "NetPBM": - $args = "-yoff=$wmAlignY "; - $args .= "-xoff=$wmAlignX "; - if ($alphaFile) - { - $args .= "-alpha=$alphaFile "; - } - $args .= $overlayFile; - break; - } - - if (isDebugging()) { - print "args = $args
"; - } + switch($gallery->app->graphics) { + case "ImageMagick": + $args = "-geometry +$wmAlignX+$wmAlignY $overlayFile $src $out"; + break; + case "NetPBM": + $args = "-yoff=$wmAlignY -xoff=$wmAlignX "; + if ($alphaFile) { + $args .= "-alpha=$alphaFile "; + } + $args .= $overlayFile; + break; + } + + debugMessage("args = $args", __FILE__, __LINE__); // Execute switch($gallery->app->graphics) @@ -1020,35 +981,24 @@ } function valid_image($file) { - if (($type = getimagesize($file)) == FALSE) { - if (isDebugging()) { - echo "
". sprintf(_("Call to %s failed in %s for file %s!"), 'getimagesize()', 'valid_image()', $file) ."
"; - } - return 0; - } + if (($type = getimagesize($file)) == FALSE) { + debugMessage(sprintf(_("Call to %s failed in %s for file %s!"), 'getimagesize()', 'valid_image()', $file), __FILE__, __LINE__); + return 0; + } - if (isDebugging()) { - echo "
". sprintf(_("File %s type %d."), $file, $type[2]) ."
"; - } - switch($type[2]) - { - case 1: // GIF - case 2: // JPEG - case 3: // PNG - return 1; - break; - default: - return 0; - break; - } + debugMessage(sprintf(_("File %s type %d."), $file, $type[2]), __FILE__, __LINE__); -/* Code is unreachable. -** Commenting out till someone finds a solution -** Jens Tkotz, 17.08.2004 - if (isDebugging()) - echo "
". sprintf(_("There was an unknown failure in the %s call!"), 'valid_image()') ."
"; - return 0; -*/ + switch($type[2]) { + case 1: // GIF + case 2: // JPEG + case 3: // PNG + return 1; + break; + + default: + return 0; + break; + } } function toPnmCmd($file) { @@ -1119,46 +1069,23 @@ return $cmd; } -function getImagePath($name, $skinname='') { - global $gallery; - - if (!$skinname) { - $skinname = $gallery->app->skinname; - } - - if (isset($gallery->app->photoAlbumURL)) { - $base = $gallery->app->photoAlbumURL; - } else { - $base = '.'; - } - - $defaultname = $base . "/images/$name"; - $fullname = dirname(__FILE__) . "/skins/$skinname/images/$name"; - $fullURL = $base . "/skins/$skinname/images/$name"; - - if (fs_file_exists($fullname) && !broken_link($fullname)) { - return "$fullURL"; - } else { - return "$defaultname"; - } -} - function includeLayout($name, $skinname='') { + global $gallery; - global $gallery; - - if (!$skinname) { - $skinname = $gallery->app->skinname; - } + if (!$skinname) { + $skinname = $gallery->app->skinname; + } - $defaultname = dirname(__FILE__) . "/layout/$name"; - $fullname = dirname(__FILE__) . "/skins/$skinname/layout/$name"; + $defaultname = dirname(__FILE__) . "/layout/$name"; + $fullname = dirname(__FILE__) . "/skins/$skinname/layout/$name"; - if (fs_file_exists($fullname) && !broken_link($fullname)) { - include ($fullname); - } else { - include ($defaultname); - } + if (fs_file_exists($fullname) && !broken_link($fullname)) { + include ($fullname); + } elseif (fs_file_exists($defaultname) && !broken_link($defaultname)) { + include ($defaultname); + } else { + echo gallery_error(sprintf(_("Problem including file %s"), $name)); + } } function includeHtmlWrap($name, $skinname='', $adds='') { @@ -1192,44 +1119,44 @@ return 1; } -function getGalleryBase() { - global $gallery; - - if (! defined("GALLERY_URL")) define ("GALLERY_URL",""); - - if (isset($gallery->app) && isset($gallery->app->photoAlbumURL)) { - $base = $gallery->app->photoAlbumURL; - } elseif (stristr($_SERVER['REQUEST_URI'],"setup")) { - $base = '..'; - } elseif (GALLERY_URL== "") { - $base = '.'; - } else { - $base = GALLERY_URL; - } - - return $base; -} - +/** + * Wrapper around _getStyleSheetLink, its defines which stylesheet link is generated. + * @return string $styleSheetLinks The generated HTML to load the stylesheets. Empty when already loaded. + */ function getStyleSheetLink() { - global $GALLERY_EMBEDDED_INSIDE; - global $GALLERY_OK; - - $styleSheetLinks = ''; - if (isset($GALLERY_OK) && $GALLERY_OK == false) { - return _getStyleSheetLink("config"); - } + global $GALLERY_EMBEDDED_INSIDE; + global $GALLERY_OK; - $styleSheetLinks = _getStyleSheetLink("base"); + static $styleSheetSet; - if ($GALLERY_EMBEDDED_INSIDE) { - $styleSheetLinks .= "\n" . _getStyleSheetLink("embedded_style"); + $styleSheetLinks = ''; + + if(! $styleSheetSet) { + if (isset($GALLERY_OK) && $GALLERY_OK == false) { + $styleSheetLinks = _getStyleSheetLink("config"); } else { - $styleSheetLinks .= "\n". _getStyleSheetLink("screen"); + $styleSheetLinks = _getStyleSheetLink("base"); + + if ($GALLERY_EMBEDDED_INSIDE) { + $styleSheetLinks .= _getStyleSheetLink("embedded_style"); + } else { + $styleSheetLinks .= _getStyleSheetLink("screen"); + } } + + $styleSheetSet = true; + } - return $styleSheetLinks; + return $styleSheetLinks; } +/** + * Generates a HTML to a css file. + * + * @param string $filename Name of css file. + * @param string $skinname Optional skinname, if omitted and not embedded, default skin is used. + * @return string + */ function _getStyleSheetLink($filename, $skinname='') { global $gallery; global $GALLERY_EMBEDDED_INSIDE; @@ -1245,32 +1172,19 @@ $sheetdefaultname = "css/$filename.css"; $sheetdefaultpath = dirname(__FILE__) . '/' . $sheetdefaultname; - $base = getGalleryBase(); - if (fs_file_exists($sheetpath) && !broken_link($sheetpath)) { - $url = "$base/$sheetname"; + $file = $sheetname; } elseif (fs_file_exists($sheetdefaultpath) && !broken_link($sheetdefaultpath)) { - $url = "$base/$sheetdefaultname"; + $file = $sheetdefaultname; } elseif (fs_file_exists($sheetdefaultdomainname) && !broken_link($sheetdefaultdomainname)) { - $url = "$base/$sheetdefaultdomainname"; + $file = $sheetdefaultdomainname; } else { - $url = "$base/${sheetdefaultname}.default"; + $file = $sheetdefaultname. '.default'; } - return ' '; -} - -function errorRow($key) { - global $gErrors; + $url = getGalleryBaseUrl() ."/$file"; - if (isset($gErrors[$key])) { - $error = $gErrors[$key]; - } else { - $error = NULL; - } - if ($error) { - include(dirname(__FILE__) . "/html/errorRow.inc"); - } + return "\n". ' '; } function drawApplet($width, $height, $code, $archive, $album, $defaults, $overrides, $configFile, $errorMsg) { @@ -1440,20 +1354,20 @@ return NULL; } - getGalleryPaths(); + setGalleryPaths(); if (!fs_file_exists(GALLERY_CONFDIR . "/config.php") || broken_link(GALLERY_CONFDIR . "config.php") || !$gallery->app) { - $GALLERY_OK=false; + $GALLERY_OK = false; return "unconfigured.php"; } if ($gallery->app->config_version != $gallery->config_version) { - $GALLERY_OK=false; + $GALLERY_OK = false; return "reconfigure.php"; } - $GALLERY_OK=true; + $GALLERY_OK = true; return NULL; } @@ -1513,14 +1427,28 @@ return 1; } -function isDebugging() { +/** + * This function checks wether we are debugging with a given level. + * If no level is given, it just returns wether we are debugging or not. + * Debug is indicated by a debuglevel greater then 0 + */ +function isDebugging($level = NULL) { global $gallery; - if (!isset($gallery) || - !isset($gallery->app) || - !isset($gallery->app->debug)) { + + if (isset($gallery->app->debuglevel)) { + if($gallery->app->debuglevel > 0) { + if(isset($level) && $gallery->app->debuglevel < $level) { + return false; + } + return true; + } + else { + return false; + } + } + else { return false; } - return !strcmp($gallery->app->debug, "yes"); } function getNextPhoto($idx, $album=NULL) { @@ -1710,26 +1638,26 @@ } } -/* -** This function checks which tool -** can we use for getting exif data from a photo. -** returns false when no way works. -*/ +/** + * This function checks which tool + * can we use for getting exif data from a photo. + * returns false when no way works. + */ function getExifDisplayTool() { - global $gallery; + global $gallery; - if(isset($gallery->app->exiftags)) { - return 'exiftags'; - } elseif (isset($gallery->app->use_exif)) { - return 'jhead'; - } else { - return false; - } + if(isset($gallery->app->exiftags)) { + return 'exiftags'; + } elseif (isset($gallery->app->use_exif)) { + return 'jhead'; + } else { + return false; + } } -/* This function does not really looks if EXIF Data is there or not. -** It just looks at the extension -*/ +/** This function does not really looks if EXIF Data is there or not. + * It just looks at the extension + */ function hasExif($file) { if(eregi('jpe?g$', $file)) { @@ -1739,62 +1667,72 @@ } } +/** + * If an exiftool is installed then gallery tries to pull out EXIF Data. + * Only fields with data are returned. + */ function getExif($file) { - global $gallery; - - $return = array(); - - switch(getExifDisplayTool()) { - case 'exiftags': - if (empty($gallery->app->exiftags)) { - break; - } - $path = $gallery->app->exiftags; - list($return, $status) = @exec_internal(fs_import_filename($path, 1) . ' -au ' . - fs_import_filename($file, 1)); + global $gallery; - break; - case 'jhead': - if (empty($gallery->app->use_exif)) { - break; - } - $path = $gallery->app->use_exif; - list($return, $status) = @exec_internal(fs_import_filename($path, 1) . ' -v ' . - fs_import_filename($file, 1)); - - break; - default: - return array(false,''); + $return = array(); + $myExif = array(); + $unwantedFields = array(); + + switch(getExifDisplayTool()) { + case 'exiftags': + if (empty($gallery->app->exiftags)) { break; - } + } + $path = $gallery->app->exiftags; + list($return, $status) = @exec_internal(fs_import_filename($path, 1) .' -au '. + fs_import_filename($file, 1)); - $myExif = array(); - if ($status == 0) { - foreach ($return as $value) { - $value = trim($value); - if (!empty($value)) { - $explodeReturn = explode(':', $value, 2); - $exifDesc = trim(htmlentities($explodeReturn[0])); - $exifData = trim(htmlentities($explodeReturn[1])); - if (isset($myExif[$exifDesc])) { - $myExif[$exifDesc] .= "
"; - } else { - $myExif[$exifDesc] = ''; - } + break; + + case 'jhead': + if (empty($gallery->app->use_exif)) { + break; + } + $path = $gallery->app->use_exif; + list($return, $status) = @exec_internal(fs_import_filename($path, 1) .' '. //. ' -v ' . + fs_import_filename($file, 1)); + + $unwantedFields = array('File name'); + break; + + default: + return array(false,''); + break; + } + + if ($status == 0) { + foreach ($return as $value) { + $value = trim($value); + if (!empty($value)) { + $explodeReturn = explode(':', $value, 2); + $exifDesc = trim(htmlentities($explodeReturn[0])); + $exifData = trim(htmlentities($explodeReturn[1])); + if(!empty($exifData) && !in_array($exifDesc, $unwantedFields)) { + if (isset($myExif[$exifDesc])) { + $myExif[$exifDesc] .= "
"; + } else { + $myExif[$exifDesc] = ''; + } - $myExif[$exifDesc] .= trim($exifData); - } + $myExif[$exifDesc] .= trim($exifData); } + } } + } - return array($status, $myExif); + return array($status, $myExif); } -/* -** This function tries to get the ItemCaptureDate from Exif Data. -** If exif is not supported, or no date was gotten, then the file creation date is returned. -** Note: i used switch/case because this is easier to extend later. -*/ +/** + * This function tries to get the ItemCaptureDate from Exif Data. + * If exif is not supported, or no date was gotten, then the file creation date is returned. + * Note: i used switch/case because this is easier to extend later. + */ function getItemCaptureDate($file) { $success = false; $exifSupported = getExifDisplayTool(); @@ -1876,7 +1814,7 @@ /* Acquire an advisory lock */ $lockfd = fs_fopen("$file.lock", "a+"); if (!$lockfd) { - echo gallery_error(sprintf(_("Could not open lock file (%s)!"), + echo gallery_error(sprintf(_("Could not open lock file (%s) for writing!"), "$file.lock")); return 0; } @@ -1988,6 +1926,45 @@ } } +function printMicroChildren($albumName,$depth=0) { + global $gallery; + $printedHeader = 0; + $myAlbum = new Album(); + $myAlbum->load($albumName); + $numPhotos = $myAlbum->numPhotos(1); + + if ($depth >= $gallery->app->albumTreeDepth) { + return; + } + for ($i=1; $i <= $numPhotos; $i++) { + //set_time_limit($gallery->app->timeLimit); + if ($myAlbum->isAlbum($i) && !$myAlbum->isHidden($i)) { + $myName = $myAlbum->getAlbumName($i, false); + $nestedAlbum = new Album(); + $nestedAlbum->load($myName); + if ($gallery->user->canReadAlbum($nestedAlbum)) { + if (strstr($nestedAlbum->gethighlightTag(), "img") === false) { continue; } + $val2 = $nestedAlbum->fields['title']; + if (!strcmp($nestedAlbum->fields['display_clicks'], 'yes') + && !$gallery->session->offline) { + $val3 = "(" . pluralize_n2(ngettext("1 hit", "%d hits", $nestedAlbum->getClicks()), $nestedAlbum->getClicks()) . ")"; + } else { + $val3 = ""; + } + if ($depth==0 && !$printedHeader++) { + echo "

". _("Sub-albums") .":
"; + } + echo "" . $nestedAlbum->getHighlightTag($gallery->app->default["nav_thumbs_size"], + "class=\"nav_micro_img\"","$val2 $val3") . " "; + printMicroChildren($myName, $depth+1); + } + } + } + +} + /* this function left in place to support patches that use it, but please use lastCommentDate functions in classes Album and AlbumItem. */ @@ -2136,227 +2113,228 @@ } function processNewImage($file, $ext, $name, $caption, $setCaption="", $extra_fields=array(), $wmName="", $wmAlign=0, $wmAlignX=0, $wmAlignY=0, $wmSelect=0) { - global $gallery; - global $temp_files; - if (acceptableArchive($ext)) { - $tool=canHandleArchive($ext); - if (empty($tool)) { - processingMsg(sprintf(_("Skipping %s (%s support not enabled)"), $name, $ext)); - return; - } + global $gallery; + global $temp_files; - /* Figure out what files we can handle. - ** Put all Filenames into $files. - */ - $files=getArchiveFileNames($file, $ext); + /* Begin of code for the case the uploade file is an archive */ + if (acceptableArchive($ext)) { + $tool = canHandleArchive($ext); + if (empty($tool)) { + processingMsg(sprintf(_("Skipping %s (%s support not enabled)"), $name, $ext)); + return; + } - /* Get meta data */ + /* Figure out what files inside the archive we can handle. + ** Put all Filenames into $files. + */ + $files = getArchiveFileNames($file, $ext); - $image_info = array(); - foreach ($files as $pic_path) { - $pic = basename($pic_path); - $tag = ereg_replace(".*\.([^\.]*)$", "\\1", $pic); - $tag = strtolower($tag); - if (!strcmp($tag, "csv")) { - extractFileFromArchive($file, $ext, $pic_path); - $image_info = array_merge($image_info, parse_csv($gallery->app->tmpDir . "/$pic",";")); - } - } + /* Get meta data */ - if ($gallery->app->debug == "yes") { - printMetaData($image_info); - } - - foreach ($files as $pic_path) { - $pic = basename($pic_path); - $tag = getExtension($pic); - if (acceptableFormat($tag) || acceptableArchive($tag)) { - extractFileFromArchive($file, $ext, $pic_path); - - /* Now process the metadates. */ - - $extra_fields = array(); - // Find in meta data array - $firstRow = 1; - $fileNameKey = "File Name"; - // $captionMetaFields will store the names (in order of priority to set caption to) - $captionMetaFields = array("Caption", "Title", "Description", "Persons"); - foreach ( $image_info as $info ) { - if ($firstRow) { - // Find the name of the file name field - foreach (array_keys($info) as $currKey) { - if (eregi("^\"?file\ ?name\"?$", $currKey)) { - $fileNameKey = $currKey; - } - } - $firstRow = 0; - } - if ($info[$fileNameKey] == $pic) { - // Loop through fields - foreach ($captionMetaFields as $field) { - // If caption isn't populated and current field is - if (!strlen($caption) && strlen($info[$field])) { - $caption = $info[$field]; - } - } - $extra_fields = $info; - } - } + $image_info = array(); + foreach ($files as $pic_path) { + $pic = basename($pic_path); + $tag = ereg_replace(".*\.([^\.]*)$", "\\1", $pic); + $tag = strtolower($tag); + if (!strcmp($tag, "csv")) { + extractFileFromArchive($file, $ext, $pic_path); + $image_info = array_merge($image_info, parse_csv($gallery->app->tmpDir . "/$pic",";")); + } + } - /* - ** Don't use the second argument for $cmd_pic_path, because it is already quoted. - */ - processNewImage($gallery->app->tmpDir . "/$pic", $tag, $pic, $caption, $setCaption, $extra_fields, $wmName, $wmAlign, $wmAlignX, $wmAlignY, $wmSelect); - fs_unlink($gallery->app->tmpDir . "/$pic"); - } - } - } else { - // remove %20 and the like from name - $name = urldecode($name); - // parse out original filename without extension - $originalFilename = eregi_replace(".$ext$", "", $name); - // replace multiple non-word characters with a single "_" - $mangledFilename = ereg_replace("[^[:alnum:]]", "_", $originalFilename); - - /* Get rid of extra underscores */ - $mangledFilename = ereg_replace("_+", "_", $mangledFilename); - $mangledFilename = ereg_replace("(^_|_$)", "", $mangledFilename); - if (empty($mangledFilename)) { - $mangledFilename = $gallery->album->newPhotoName(); - } - - /* - need to prevent users from using original filenames that are purely numeric. - Purely numeric filenames mess up the rewriterules that we use for mod_rewrite - specifically: - RewriteRule ^([^\.\?/]+)/([0-9]+)$ /~jpk/gallery/view_photo.php?set_albumName=$1&index=$2 [QSA] - */ - - if (ereg("^([0-9]+)$", $mangledFilename)) { - $mangledFilename .= "_G"; - } - - set_time_limit($gallery->app->timeLimit); - if (acceptableFormat($ext)) { + debugMessage(printMetaData($image_info), __FILE__, __LINE__); - /* - * Move the uploaded image to our temporary directory - * using move_uploaded_file so that we work around - * issues with the open_basedir restriction. - */ - if (function_exists('move_uploaded_file')) { - $newFile = tempnam($gallery->app->tmpDir, "gallery"); - if (move_uploaded_file($file, $newFile)) { - $file = $newFile; - } - - /* Make sure we remove this file when we're done */ - $temp_files[$newFile]=1; + /* Now process all valid files we found */ + foreach ($files as $pic_path) { + $pic = basename($pic_path); + $tag = getExtension($pic); + if (acceptableFormat($tag) || acceptableArchive($tag)) { + extractFileFromArchive($file, $ext, $pic_path); + + /* Now process the metadates. */ + $extra_fields = array(); + + /* Find in meta data array */ + $firstRow = 1; + $fileNameKey = "File Name"; + + /* $captionMetaFields will store the names (in order of priority to set caption to) */ + $captionMetaFields = array("Caption", "Title", "Description", "Persons"); + foreach ( $image_info as $info ) { + if ($firstRow) { + /* Find the name of the file name field */ + foreach (array_keys($info) as $currKey) { + if (eregi("^\"?file\ ?name\"?$", $currKey)) { + $fileNameKey = $currKey; + } } - - echo "\n

******". sprintf(_("Adding %s"), $name) ."*****

"; - - /* What should the caption be, if no caption was given by user ? - ** See captionOptions.inc.php for options - */ - - if (isset($gallery->app->dateTimeString)) { - $dateTimeFormat = $gallery->app->dateTimeString; - } else { - $dateTimeFormat = "%D %T"; - } - if ($caption == "") { - switch ($setCaption) { - case 1: - /* Use filename */ - $caption = strtr($originalFilename, '_', ' '); - break; - case 2: - /* Use file cration date */ - $caption = strftime($dateTimeFormat, filectime($file)); - break; - case 3: - /* Use capture date */ - $caption = strftime($dateTimeFormat, getItemCaptureDate($file)); - break; - } + $firstRow = 0; + } + + if ($info[$fileNameKey] == $pic) { + /* Loop through fields */ + foreach ($captionMetaFields as $field) { + /* If caption isn't populated and current field is */ + if (!strlen($caption) && strlen($info[$field])) { + $caption = $info[$field]; + } } + + $extra_fields = $info; + } + } + /* Don't use the second argument for $cmd_pic_path, because it is already quoted. */ - if (!$extra_fields) { - $extra_fields=array(); - } - $err = $gallery->album->addPhoto($file, $ext, $mangledFilename, $caption, "", $extra_fields, $gallery->user->uid, NULL, $wmName, $wmAlign, $wmAlignX, $wmAlignY, $wmSelect); - if ($err) { - processingMsg(gallery_error($err)); - processingMsg("". sprintf(_("Need help? Look in the %s%s FAQ%s"), - '', - Gallery(), - '').""); - } - } else { - processingMsg(sprintf(_("Skipping %s (can't handle %s format)"), $name, $ext)); - } + processNewImage($gallery->app->tmpDir . "/$pic", $tag, $pic, $caption, $setCaption, $extra_fields, $wmName, $wmAlign, $wmAlignX, $wmAlignY, $wmSelect); + fs_unlink($gallery->app->tmpDir . "/$pic"); } -} + } +} else { + /* Its a single file */ + /* remove %20 and the like from name */ + $name = urldecode($name); + + /* parse out original filename without extension */ + $originalFilename = eregi_replace(".$ext$", "", $name); + + /* replace multiple non-word characters with a single "_" */ + $mangledFilename = ereg_replace("[^[:alnum:]]", "_", $originalFilename); + + /* Get rid of extra underscores */ + $mangledFilename = ereg_replace("_+", "_", $mangledFilename); + $mangledFilename = ereg_replace("(^_|_$)", "", $mangledFilename); + if (empty($mangledFilename)) { + $mangledFilename = $gallery->album->newPhotoName(); + } + + /* + ** need to prevent users from using original filenames that are purely numeric. + ** Purely numeric filenames mess up the rewriterules that we use for mod_rewrite + ** specifically: + ** RewriteRule ^([^\.\?/]+)/([0-9]+)$ /~jpk/gallery/view_photo.php?set_albumName=$1&index=$2 [QSA] + */ + + if (ereg("^([0-9]+)$", $mangledFilename)) { + $mangledFilename .= "_G"; + } + + set_time_limit($gallery->app->timeLimit); + if (acceptableFormat($ext)) { + /* + ** Move the uploaded image to our temporary directory + ** using move_uploaded_file so that we work around + ** issues with the open_basedir restriction. + */ + if (function_exists('move_uploaded_file')) { + $newFile = tempnam($gallery->app->tmpDir, "gallery"); + if (move_uploaded_file($file, $newFile)) { + $file = $newFile; + } + + /* Make sure we remove this file when we're done */ + $temp_files[$newFile] = 1; + } + + echo "\n

******". sprintf(_("Adding %s"), $name) ."*****

"; -function processingMsg($buf) { - echo "\n
$buf"; - my_flush(); + /* What should the caption be, if no caption was given by user ? + ** See captionOptions.inc.php for options + */ + + if (isset($gallery->app->dateTimeString)) { + $dateTimeFormat = $gallery->app->dateTimeString; + } else { + $dateTimeFormat = "%D %T"; + } + + if (empty($caption)) { + switch ($setCaption) { + case 1: + /* Use filename */ + $caption = strtr($originalFilename, '_', ' '); + break; + case 2: + /* Use file cration date */ + $caption = strftime($dateTimeFormat, filectime($file)); + break; + case 3: + /* Use capture date */ + $caption = strftime($dateTimeFormat, getItemCaptureDate($file)); + break; + } + } + + if (!$extra_fields) { + $extra_fields = array(); + } + + /* After all the preprocessing, NOW ADD THE element */ + $err = $gallery->album->addPhoto($file, $ext, $mangledFilename, $caption, "", $extra_fields, $gallery->user->uid, NULL, $wmName, $wmAlign, $wmAlignX, $wmAlignY, $wmSelect); + if ($err) { + processingMsg(gallery_error($err)); + processingMsg("". sprintf(_("Need help? Look in the %s%s FAQ%s"), + '', Gallery(), '') . + ""); + } + } else { + processingMsg(sprintf(_("Skipping %s (can't handle %s format)"), $name, $ext)); + } + } } -function createNewAlbum( $parentName, $newAlbumName="", $newAlbumTitle="", $newAlbumDesc="") { - global $gallery; +function createNewAlbum( $parentName, $newAlbumName = '', $newAlbumTitle = '', $newAlbumDesc = '') { + global $gallery; - // get parent album name - $albumDB = new AlbumDB(FALSE); + // get parent album name + $albumDB = new AlbumDB(FALSE); - // set new album name from param or default + // set new album name from param or default $gallery->session->albumName = $albumDB->newAlbumName($newAlbumName); - $gallery->album = new Album(); + $gallery->album = new Album(); $gallery->album->fields["name"] = $gallery->session->albumName; // guid is not created during new Album() as a performance optimization // it only needs to be created when an album is created or modified by adding or deleting photos $gallery->album->fields['guid'] = genGUID(); - // set title and description - if (!empty($newAlbumTitle)) { - $gallery->album->fields["title"] = $newAlbumTitle; - } - if (!empty($newAlbumDesc)) { - $gallery->album->fields["description"] = $newAlbumDesc; - } - - $gallery->album->setOwner($gallery->user->getUid()); - - /* if this is a nested album, set nested parameters */ - if (!empty($parentName)) { - $gallery->album->fields['parentAlbumName'] = $parentName; - $parentAlbum = $albumDB->getAlbumByName($parentName); - $parentAlbum->addNestedAlbum($gallery->session->albumName); - $parentAlbum->save(array(i18n("Album \"{$gallery->album->fields['name']}\" created as a sub-album of \"$parentName\"."))); - // Set default values in nested album to match settings of parent. - $gallery->album->fields["perms"] = $parentAlbum->fields["perms"]; - $gallery->album->fields['extra_fields'] = $parentAlbum->fields['extra_fields']; - $gallery->album->fields["bgcolor"] = $parentAlbum->fields["bgcolor"]; - $gallery->album->fields["textcolor"] = $parentAlbum->fields["textcolor"]; - $gallery->album->fields["linkcolor"] = $parentAlbum->fields["linkcolor"]; + // set title and description + if (!empty($newAlbumTitle)) { + $gallery->album->fields["title"] = $newAlbumTitle; + } + if (!empty($newAlbumDesc)) { + $gallery->album->fields["description"] = $newAlbumDesc; + } + + $gallery->album->setOwner($gallery->user->getUid()); + + /* if this is a nested album, set nested parameters */ + if (!empty($parentName)) { + $gallery->album->fields['parentAlbumName'] = $parentName; + $parentAlbum = $albumDB->getAlbumByName($parentName); + $parentAlbum->addNestedAlbum($gallery->session->albumName); + $parentAlbum->save(array(i18n("Album \"{$gallery->album->fields['name']}\" created as a sub-album of \"$parentName\"."))); + // Set default values in nested album to match settings of parent. + $gallery->album->fields["perms"] = $parentAlbum->fields["perms"]; + $gallery->album->fields['extra_fields'] = $parentAlbum->fields['extra_fields']; + $gallery->album->fields["bgcolor"] = $parentAlbum->fields["bgcolor"]; + $gallery->album->fields["textcolor"] = $parentAlbum->fields["textcolor"]; + $gallery->album->fields["linkcolor"] = $parentAlbum->fields["linkcolor"]; $gallery->album->fields['background'] = $parentAlbum->fields['background']; - $gallery->album->fields["font"] = $parentAlbum->fields["font"]; - $gallery->album->fields["border"] = $parentAlbum->fields["border"]; - $gallery->album->fields["bordercolor"] = $parentAlbum->fields["bordercolor"]; - $gallery->album->fields["thumb_size"] = $parentAlbum->fields["thumb_size"]; - $gallery->album->fields["resize_size"] = $parentAlbum->fields["resize_size"]; - $gallery->album->fields["resize_file_size"] = $parentAlbum->fields["resize_file_size"]; + $gallery->album->fields["font"] = $parentAlbum->fields["font"]; + $gallery->album->fields["border"] = $parentAlbum->fields["border"]; + $gallery->album->fields["bordercolor"] = $parentAlbum->fields["bordercolor"]; + $gallery->album->fields["thumb_size"] = $parentAlbum->fields["thumb_size"]; + $gallery->album->fields["resize_size"] = $parentAlbum->fields["resize_size"]; + $gallery->album->fields["resize_file_size"] = $parentAlbum->fields["resize_file_size"]; $gallery->album->fields['max_size'] = $parentAlbum->fields['max_size']; $gallery->album->fields['max_file_size'] = $parentAlbum->fields['max_file_size']; $gallery->album->fields['returnto'] = $parentAlbum->fields['returnto']; - $gallery->album->fields["rows"] = $parentAlbum->fields["rows"]; - $gallery->album->fields["cols"] = $parentAlbum->fields["cols"]; - $gallery->album->fields["fit_to_window"] = $parentAlbum->fields["fit_to_window"]; - $gallery->album->fields["use_fullOnly"] = $parentAlbum->fields["use_fullOnly"]; - $gallery->album->fields["print_photos"] = $parentAlbum->fields["print_photos"]; + $gallery->album->fields["rows"] = $parentAlbum->fields["rows"]; + $gallery->album->fields["cols"] = $parentAlbum->fields["cols"]; + $gallery->album->fields["fit_to_window"] = $parentAlbum->fields["fit_to_window"]; + $gallery->album->fields["use_fullOnly"] = $parentAlbum->fields["use_fullOnly"]; + $gallery->album->fields["print_photos"] = $parentAlbum->fields["print_photos"]; $gallery->album->fields['slideshow_type'] = $parentAlbum->fields['slideshow_type']; $gallery->album->fields['slideshow_recursive'] = $parentAlbum->fields['slideshow_recursive']; $gallery->album->fields['slideshow_length'] = $parentAlbum->fields['slideshow_length']; @@ -2364,30 +2342,30 @@ $gallery->album->fields['album_frame'] = $parentAlbum->fields['album_frame']; $gallery->album->fields['thumb_frame'] = $parentAlbum->fields['thumb_frame']; $gallery->album->fields['image_frame'] = $parentAlbum->fields['image_frame']; - $gallery->album->fields["use_exif"] = $parentAlbum->fields["use_exif"]; - $gallery->album->fields["display_clicks"] = $parentAlbum->fields["display_clicks"]; + $gallery->album->fields["use_exif"] = $parentAlbum->fields["use_exif"]; + $gallery->album->fields["display_clicks"] = $parentAlbum->fields["display_clicks"]; $gallery->album->fields["item_owner_display"] = $parentAlbum->fields["item_owner_display"]; $gallery->album->fields["item_owner_modify"] = $parentAlbum->fields["item_owner_modify"]; $gallery->album->fields["item_owner_delete"] = $parentAlbum->fields["item_owner_delete"]; $gallery->album->fields["add_to_beginning"] = $parentAlbum->fields["add_to_beginning"]; $gallery->album->fields['showDimensions'] = $parentAlbum->fields['showDimensions']; - - $returnVal = $gallery->album->save(array(i18n("Album \"{$gallery->album->fields['name']}\" created as a sub-album of \"$parentName\"."))); - } else { - $gallery->album->save(array(i18n("Root album \"{$gallery->album->fields['name']}\" created."))); - /* - * Get a new albumDB because our old copy is not up to - * date after we created a new album - */ - $albumDB = new AlbumDB(FALSE); - - /* move the album to the top if not a nested album*/ - $numAlbums = $albumDB->numAlbums($gallery->user); - $albumDB->moveAlbum($gallery->user, $numAlbums, 1); - $returnVal = $albumDB->save(); - } - if (!empty($returnVal)) { + $returnVal = $gallery->album->save(array(i18n("Album \"{$gallery->album->fields['name']}\" created as a sub-album of \"$parentName\"."))); + } else { + $gallery->album->save(array(i18n("Root album \"{$gallery->album->fields['name']}\" created."))); + /* + * Get a new albumDB because our old copy is not up to + * date after we created a new album + */ + $albumDB = new AlbumDB(FALSE); + + /* move the album to the top if not a nested album*/ + $numAlbums = $albumDB->numAlbums($gallery->user); + $albumDB->moveAlbum($gallery->user, $numAlbums, 1); + $returnVal = $albumDB->save(); + } + + if (!empty($returnVal)) { return $gallery->session->albumName; } else { return 0; @@ -2419,13 +2397,8 @@ print "\n"; } -/* returns the offical name of the gallery */ -function Gallery() { - return "Gallery"; -} - /*returns a link to the docs, if present, or NULL */ -function galleryDocs($class='') { +function galleryDocs() { global $gallery; if (fs_file_exists(dirname(__FILE__) .'/docs/index.html')) { @@ -2496,42 +2469,27 @@ } /* Preserve comment, EXIF data if a JPEG if $keepProfiles is set. */ + + $sizeCmd = ''; + $geometryCmd = ''; + if ($target) { + $sizeCmd = "-size ${target}x${target} "; + $geometryCmd = "-geometry ${target}x${target} "; + } + exec_wrapper(ImCmd('convert', - "-quality $quality " - . ($target ? "-size ${target}x${target} " : '') - . $keepProfiles - . ' -coalesce ' /* Better support for animated GIFs */ - . $srcFile - . ($target ? " -geometry ${target}x${target} " : ' ') - /* '-deconstruct' turns animated images back into the separate pieces which were merged using - '-coalesce', but causes problems with some images, so we don't want to use it. */ - . $outFile)); + $srcFile . + " -quality $quality $sizeCmd $keepProfiles -coalesce $geometryCmd $outFile" + )); + break; default: - if (isDebugging()) { - echo "
" . _("You have no graphics package configured for use!")."
"; - } - break; + echo debugMessage(_("You have no graphics package configured for use!")); + break; } } -function poweredBy () { - global $gallery; - $link = ''.Gallery().''; - if (isDebugging() || $gallery->app->devMode == "yes" || $gallery->user->isAdmin()) { - $version = $gallery->version; - } else { - $version = "1"; - } - - if ($gallery->session->offline) { - return sprintf(_("Generated by %s v%s"), $link, $version); - } else { - return sprintf(_("Powered by %s v%s"), $link, $version); - } -} - define("OS_WINDOWS", "win"); define("OS_LINUX", "linux"); define("OS_SUNOS", "SunOS"); @@ -2549,46 +2507,7 @@ } } -/* -** The functions checks if the given email(s) is(are) in a valid format. -** -** if $multiples is true, look to see if it's a list of comma separated addresses. -** -** Return email(s) when email(s) is(are) correct, else false. -*/ - -function gallery_validate_email($email, $multiples=false) -{ - if (eregi('^([a-z0-9_]|\-|\.|\+)+@(([a-z0-9_]|\-)+\.)+[a-z]{2,4}$', $email)) { - return $email; - } elseif (!$multiples) { - return false; - } else { - $email = ereg_replace('([[:space:]]+)', '', $email); - $emails = array_filter(explode(',', $email)); - $size = sizeof($emails); - if ($size < 1) { - return false; - } else { - $email=""; - $join=""; - foreach ($emails as $email) { - if (gallery_validate_email($email)) { - $email .= "$join$email"; - $join=", "; - } else { - if (isDebugging()) { - print sprintf(_("Skipping invalid email address %s"), $email); - } - } - } - return $email; - } - } -} - -function generate_password($len = 10) -{ +function generate_password($len = 10) { $result = ''; $alpha = 'abcdefghijklmnopqrstuvwxyz' . '0123456789' . @@ -2612,8 +2531,7 @@ return $result; } -function pretty_password($pass, $print, $pre = ' ') -{ +function pretty_password($pass, $print, $pre = ' ') { $idx = -1; $len = strlen($pass); @@ -2641,247 +2559,17 @@ return "$result\n"; } -function emailDisclaimer() { - global $gallery; - $msg = sprintf(_("Note: This is an automatically generated email message sent from the %s website. If you have received this in error, please ignore this message."),$gallery->app->photoAlbumURL). - " \r\n". - sprintf(_("Report abuse to %s"),$gallery->app->adminEmail); - $msg2 = sprintf("Note: This is an automatically generated email message sent from the %s website. If you have received this in error, please ignore this message. \r\nReport abuse to %s", - $gallery->app->photoAlbumURL, $gallery->app->adminEmail); - if ($msg != $msg2) { - return "[$msg\r\n$msg2]\r\n\r\n"; - } else { - return "[$msg]\r\n\r\n"; - } -} - - - -function gallery_mail($to, $subject, $msg, $logmsg, $hide_recipients = false, $from = NULL) { - global $gallery; - - $headers =''; - $additional_headers = ''; - - if ($gallery->app->emailOn == "no") { - echo "\n
". gallery_error(_("Email not sent as it is disabled for this gallery")); - return false; - } - - if (empty($to)) { - echo "\n
". gallery_error(sprintf(_("Email not sent as no address provided"), - "" . $to . "")); - return false; - } - - if (!gallery_validate_email($to, true)) { - echo "\n
". gallery_error(sprintf(_("Email not sent to %s as it is not a valid address"), - "" . $to . "")); - return false; - } - - if ($hide_recipients) { - $bcc=$to; - $to=""; - $join=","; - } else { - $bcc=""; - $join=""; - } - - if (!gallery_validate_email($from)) { - if (isDebugging() && $from) { - echo "\n
". gallery_error( sprintf(_("Sender address %s is invalid, using %s."), - $from, $gallery->app->senderEmail)); - } - $from = $gallery->app->senderEmail; - $reply_to = $gallery->app->adminEmail; - } else { - $reply_to = $from; - } - - if (isset($gallery->app->email_notification) && - in_array("bcc", $gallery->app->email_notification)) { - $bcc .= $join . $gallery->app->adminEmail; - } - - /* Minimum Headers according to RFC 822 A.3.1. */ - $headers = "Date: ". date("r") ."\r\n"; - $headers .= "From: ". $gallery->app->galleryTitle ." ". _("Administrator") . " <$from>\r\n"; +function logMessage ($msg, $logfile) { - /* Additional headers */ - $additional_headers = "Reply-To: <$reply_to>\r\n"; - $additional_headers .= "X-GalleryRequestIP: " . $_SERVER['REMOTE_ADDR'] . "\r\n"; - $additional_headers .= "MIME-Version: 1.0\r\n"; - $additional_headers .= "Content-type: text/plain; charset=\"". $gallery->charset ."\"\r\n"; - - if ($bcc) { - $additional_headers .= "Bcc: " . $bcc . "\r\n"; - } - - if (get_magic_quotes_gpc()) { - $msg = stripslashes($msg); - } - - $msg = unhtmlentities($msg); - $subject = unhtmlentities($gallery->app->emailSubjPrefix . " " . $subject); - - // Ensure that there are no bare linefeeds by replacing "\r" or "\n" - // (but not the individual components of "\r\n") with "\r\n" - $msg = preg_replace("/([^\r])?\n|\r([^\n])?/", "\\1\r\n\\2", $msg); - - if ($gallery->app->useOtherSMTP != "yes") { - $result = mail($to, $subject, emailDisclaimer() . $msg, $headers . $additional_headers); - } else { - $result = gallery_smtp($to, $bcc, $subject, $msg, $headers . $additional_headers); + if ($fd = fs_fopen($logfile, "a")) { + fwrite($fd, strftime("%Y/%m/%d %H:%M.%S: $msg\n")); + fclose($fd); } - - // Commented to prevent accidental disclosure of passwords via debug screens - // Remove the "false &&" to enable for testing purposes - if (false && isDebugging()) { - print ""; - print ""; - print ""; - print ""; - print ''; - print "
To:<" . - _("not shown") . ">
Subject:$subject
"; - print str_replace(":", ":", - ereg_replace(":[^:\n]*\n", ":<" . - _("not shown") . - ">
", - $additional_headers)); - print "
' . _("Message") . - ':'. str_replace("\n", "
", $msg). '
"; - if ($result) { - print _("Email sent")."
"; - } else { - echo gallery_error(_("Email not sent")); - } + elseif (isDebugging()) { + print sprintf(_("Cannot open logfile: %s"), $logfile); } - emailLogMessage($logmsg, $result); - return $result; } -function gallery_smtp($to, $bcc, $subject, $msg, $additional_headers) { - global $gallery; - - $lb = "\r\n"; // linebreak - $hdr = explode($lb, $additional_headers); // header fields - $result = 0; - - $bdy = emailDisclaimer() . $msg; - if (!empty($bdy)) { - $bdy = ereg_replace("^\.", "..", $bdy); - $bdy = explode($lb, $bdy); - } - - // build the array for the SMTP dialog. Line content is - // array((string)command, (string)success code, (string)debug error message) - if (!empty($gallery->app->smtpUserName)) { // SMTP authentication methode AUTH LOGIN, use extended HELO "EHLO" - $smtp = array( - // call the server and tell the name of your local host - array("EHLO " . $gallery->app->smtpFromHost . $lb, "220,250", "HELO error: "), - // request to auth - array("AUTH LOGIN" . $lb, "334", "AUTH error:"), - // username - array(base64_encode($gallery->app->smtpUserName) . $lb, "334", "AUTHENTICATION error : "), - // password - array(base64_encode($gallery->app->smtpPassword) . $lb, "235", "AUTHENTICATION error : ")); - } - else { // no authentication, use standard HELO - $smtp = array( - // call the server and tell the name of your local host - array("HELO " . $gallery->app->smtpFromHost . $lb, "220,250", "HELO error: ")); - } - - // envelop - if ($to == "") { - $bcc_array = explode(", ",$bcc); - foreach ($bcc_array as $bccto) { - if ($bccto != "") { - $smtp[] = array("MAIL FROM: " . '<' . $from . '>' . $lb, "250", "MAIL FROM error: "); - $smtp[] = array("RCPT TO: " . '<' . $bccto . '>' . $lb, "250", "RCPT TO:" . '<' . $bccto . '>' . " error: "); - // begin data - $smtp[] = array("DATA" . $lb, "354", "DATA error: "); - // header - $smtp[] = array("Subject: " . $subject . $lb, "", ""); - $smtp[] = array("To: <$bccto>" . $lb, "", ""); - foreach ($hdr as $h) { - if (!empty($h)) { - $smtp[] = array($h . $lb, "", ""); - } - } - // end header, begin the body - $smtp[] = array($lb,"",""); - if ($bdy) { - foreach ($bdy as $b) { - $smtp[] = array($b . $lb, "", ""); - } - } - // end of messageO5B - $smtp[] = array($lb . "." . $lb, "250", "DATA(end) error: "); - } - } - } else { - $smtp[] = array("MAIL FROM: " . '<' . $from . '>' . $lb, "250", "MAIL FROM error: "); - $smtp[] = array("RCPT TO: " . '<' . $to . '>' . $lb, "250", "RCPT TO:" . $to . " error: "); - // begin data - $smtp[] = array("DATA" . $lb, "354", "DATA error: "); - // header - $smtp[] = array("Subject: " . $subject . $lb, "", ""); - $smtp[] = array("To: <$to>" . $lb, "", ""); - foreach ($hdr as $h) { - if (!empty($h)) { - $smtp[] = array($h . $lb, "", ""); - } - } - // end header, begin the body - $smtp[] = array($lb, "", ""); - if ($bdy) { - foreach ($bdy as $b) { - $smtp[] = array($b . $lb, "", ""); - } - } - // end of message - $smtp[] = array($lb . "." . $lb, "250", "DATA(end)error: "); - } - $smtp[] = array("QUIT" . $lb, "221", "QUIT error: "); - - // open socket - $fp = @fsockopen($gallery->app->smtpHost, $gallery->app->smtpPort); - if (!$fp){ - echo "Error: Cannot connect to " . $gallery->app->smtpHost . "
"; - $result = 1; - } - $banner = @fgets($fp, 1024); - // perform the SMTP dialog with all lines of the list - foreach ($smtp as $req){ - // send request - @fputs($fp, $req[0]); - // get available server messages and stop on errors - if ($req[1]) { - while ($result = @fgets($fp, 1024)){ - if (substr($result,3,1) == " ") { - break; - } - }; - if (!strstr($req[1], substr($result, 0, 3))) { - if (isDebugging()) { - echo "$req[2] . $result
"; - } - $result = 1; - } - } - } - @fgets($fp, 1024); - // close socket - @fclose($fp); - - return $result; -} - - /* Formats a nice string to print below an item with comments */ function lastCommentString($lastCommentDate, &$displayCommentLegend) { global $gallery; @@ -2898,158 +2586,90 @@ return $ret; } -function emailLogMessage($logmsg, $result) { +function available_skins($description_only = false) { global $gallery; - if (!$result) { - $logmsg = _("FAILED")."/FAILED: $logmsg"; - } - if (isset($gallery->app->email_notification) && - in_array("logfile", $gallery->app->email_notification)) { - $logfile=$gallery->app->userDir."/email.log"; - logMessage($logmsg, $logfile); - } - if (isset($gallery->app->email_notification) && - in_array("email", $gallery->app->email_notification)) { - $subject = _("Email activity"); - if ($subject != "Email activity") { - $subject .= "/Email activity"; - } - $subject .= ": ". $gallery->app->galleryTitle; - - if ($gallery->app->useOtherSMTP != "yes") { - mail($gallery->app->adminEmail, - $subject, - emailDisclaimer().$logmsg, - "From: " . $gallery->app->senderEmail . "\r\n"); - } else { - gallery_smtp($gallery->app->adminEmail, "", - $subject, $logmsg, - "From: " . $gallery->app->senderEmail . "\r\n"); - } - } -} -function logMessage ($msg, $logfile) { - - if ($fd = fs_fopen($logfile, "a")) { - fwrite($fd, strftime("%Y/%m/%d %H:%M.%S: $msg\n")); - fclose($fd); + $version =''; + $last_update =''; + $possibleSkins = array(); + + if (isset($gallery->app->photoAlbumURL)) { + $base_url = $gallery->app->photoAlbumURL; } - elseif (isDebugging()) { - print sprintf(_("Cannot open logfile: %s"), $logfile); + else { + $base_url = ".."; } -} -function welcome_email($show_default=false) { - global $gallery; + $dir = dirname(__FILE__) . '/skins'; + $opts['none'] = 'No Skin'; + $descriptions="
"; + $name = "". _("No Skin") .""; + $descriptions .= sprintf (_('
%s
The original look and feel.
'), $name); + $skincount = 0; - $default=_("Hi !!FULLNAME!!, + if (fs_is_dir($dir) && is_readable($dir) && $fd = fs_opendir($dir)) { + while ($file = readdir($fd)) { + $subdir="$dir/$file/css"; + $skincss="$subdir/screen.css"; + if (fs_is_dir($subdir) && fs_file_exists($skincss)) { + $possibleSkins[] = $file; + } + } -Congratulations. You have just been subscribed to %s at %s. Your account name is !!USERNAME!!. Please visit the gallery soon, and create a password by clicking this link: + sort($possibleSkins); + foreach($possibleSkins as $file) { + $subdir="$dir/$file/css"; + $skininc="$dir/$file/style.def"; + $name=""; + $description=""; + $skincss="$subdir/screen.css"; + $skincount++; -!!NEWPASSWORDLINK!! + if (fs_file_exists($skininc)) { + require($skininc); + } -Gallery @ %s Administrator."); - if ($show_default) { - return sprintf($default, - "<" . _("gallery title") . ">", - "<" . _("gallery URL") . ">", - "<" . _("gallery title") . ">"); - } elseif (empty($gallery->app->emailGreeting)) { - return sprintf($default, - $gallery->app->galleryTitle, - $gallery->app->photoAlbumURL, - $gallery->app->galleryTitle); - } else { - return $gallery->app->emailGreeting; - } + if (empty($name)) { + $name = $file; + } -} + $opts[$file]=$name; + if (fs_file_exists("$dir/$file/images/screenshot.jpg")) { + $screenshot = $base_url . "/skins/$file/images/screenshot.jpg"; + } elseif (fs_file_exists("$dir/$file/images/screenshot.gif")) { + $screenshot = $base_url . "/skins/$file/images/screenshot.gif"; + } else { + $screenshot = ""; + } -function available_skins($description_only=false) { + if ($screenshot) { + $name = popup_link($name, $screenshot, 1, false, + 500, 800, '', 'document.config.skinname.options['. $skincount. '].selected=true; '); + } - global $gallery; - $version =''; - $last_update =''; - $possibleSkins = array(); + $descriptions.="\n
$name"; + if (!isset ($version)) { + $version = _("unknown"); + } - if (isset($gallery->app->photoAlbumURL)) { - $base_url = $gallery->app->photoAlbumURL; - } - else { - $base_url = ".."; - } + if (!isset($last_update)) { + $last_update = _("unknown"); + } - $dir = dirname(__FILE__) . '/skins'; - $opts['none'] = 'No Skin'; - $descriptions="
"; - $name = "". _("No Skin") .""; - $descriptions .= sprintf (_('
%s
The original look and feel.
'), $name); - $skincount = 0; - - if (fs_is_dir($dir) && is_readable($dir) && $fd = fs_opendir($dir)) { - while ($file = readdir($fd)) { - $subdir="$dir/$file/css"; - $skincss="$subdir/screen.css"; - if (fs_is_dir($subdir) && fs_file_exists($skincss)) { - $possibleSkins[] = $file; - } - } - - sort($possibleSkins); - foreach($possibleSkins as $file) { - $subdir="$dir/$file/css"; - $skininc="$dir/$file/style.def"; - $name=""; - $description=""; - $skincss="$subdir/screen.css"; - $skincount++; - - if (fs_file_exists($skininc)) { - require($skininc); - } - - if (empty($name)) { - $name = $file; - } - - $opts[$file]=$name; - if (fs_file_exists("$dir/$file/images/screenshot.jpg")) { - $screenshot = $base_url . "/skins/$file/images/screenshot.jpg"; - } elseif (fs_file_exists("$dir/$file/images/screenshot.gif")) { - $screenshot = $base_url . "/skins/$file/images/screenshot.gif"; - } else { - $screenshot = ""; - } - - if ($screenshot) { - $name = popup_link($name, $screenshot, 1, false, - 500, 800, '', 'document.config.skinname.options['. $skincount. '].selected=true; '); - } + $descriptions .= ''; + $descriptions .= _("Version") .": $version"; + $descriptions .= "   "; + $descriptions .= _("Last Update") . ": $last_update
"; + $descriptions .= "
$description
"; + } - $descriptions.="\n
$name"; - if (!isset ($version)) { - $version = _("unknown"); - } - - if (!isset($last_update)) { - $last_update = _("unknown"); - } - - $descriptions .= ''; - $descriptions .= _("Version") .": $version"; - $descriptions .= "   "; - $descriptions .= _("Last Update") . ": $last_update
"; - $descriptions .= "
$description
"; - } + $descriptions .="\n
"; - $descriptions .="\n"; - - if ($description_only) { - return $descriptions; - } else { - return $opts; + if ($description_only) { + return $descriptions; + } else { + return $opts; + } } - } } function available_frames($description_only=false) { @@ -3168,53 +2788,70 @@ echo '' . "\n"; } -function common_header() { +function common_header($adds = array()) { + $metaTagAdds = array(); + if(isset($adds['metaTags'])) { + $metaTagAdds = $adds['metaTags']; + } // Do some meta tags - metatags(); - -// Import CSS Style_sheet - echo getStyleSheetLink(); + metatags($metaTagAdds); +// Import CSS Style_sheet + echo getStyleSheetLink(); + // Set the Gallery Icon - echo "\n \n"; + echo "\n \n"; } -function metatags() { - global $gallery; +function metatags($adds = array()) { + global $gallery; - echo ''; - echo "\n ". ''; - echo "\n ". 'language) . '">'; - echo "\n\n"; -} + echo ''; + echo "\n ". ''; + echo "\n ". 'language) . '">'; -// uses makeGalleryURL -function gallery_validation_link($file, $valid=true, $args='') { - global $gallery; - if ($gallery->app->devMode == "no") { - return ""; + if(!empty($adds)) { + foreach ($adds as $name => $content) { + echo "\n ". ''; } + } + echo "\n"; +} - if (!isset($args)) { - $args=array(); - } - - $args['PHPSESSID']=session_id(); +/** + * Generates a link to w3c validator + * + * @param string $file file to validate, relative to gallery dir + * @param boolean $valid true/false wether we know the result ;) + * @param array $arg optional array with urlargs + * @return string $link HTML hyperlink + */ +function gallery_validation_link($file, $valid=true, $args = array()) { + global $gallery; - if (!empty($file)) { - $uri = urlencode(eregi_replace("&", "&", makeGalleryURL($file, $args))); - } - else { - $uri = 'referer&PHPSESSID='. $args['PHPSESSID']; - } - $link=''. - 'Valid HTML 4.01!'; - if (!$valid) { - $link .= _("Not valid yet"); - } + if (isset($gallery->app->devMode) && $gallery->app->devMode == "no") { + return ''; + } - return $link; + $args['PHPSESSID'] = session_id(); + $url = makeGalleryURL($file, $args); + + if (!empty($file) && isset($gallery->app->photoAlbumURL)) { + $uri = urlencode(eregi_replace("&", "&", $url)); + } + else { + $uri = 'referer&PHPSESSID='. $args['PHPSESSID']; + } + + $link = ''. + 'Valid HTML 4.01!'; + + if (!$valid) { + $link .= _("Not valid yet"); + } + + return $link; } // uses makeAlbumURL @@ -3235,16 +2872,20 @@ return $link; } +/** + * @return string $location Location where Gallery assmes the user. Can be 'core' or 'config' + */ function where_i_am() { - global $GALLERY_OK; - - if ($GALLERY_OK == true && strpos($_SERVER['REQUEST_URI'],"setup") == 0) { - return "core"; - } else { - return "config"; - } + global $GALLERY_OK; + if (!stristr($_SERVER['REQUEST_URI'],'setup') || $GALLERY_OK) { + $location = 'core'; + } else { + $location = 'config'; + } + return $location; } + function user_name_string($uid, $format='!!FULLNAME!! (!!USERNAME!!)') { global $gallery; if ($uid) { @@ -3365,31 +3006,9 @@ } } -/* -** Define Constants for Gallery pathes. -*/ -function getGalleryPaths() { - if (defined('GALLERY_BASE')) { - return; - } - - $currentFile = __FILE__; - if ( $currentFile == '/usr/share/gallery/util.php') { - /* Gallery runs on as Debian Package */ - define ("GALLERY_CONFDIR", "/etc/gallery"); - define ("GALLERY_SETUPDIR", "/var/lib/gallery/setup"); - } else { - define ("GALLERY_CONFDIR", dirname(__FILE__)); - define ("GALLERY_SETUPDIR", dirname(__FILE__) . "/setup"); - } - - define ("GALLERY_BASE", dirname(__FILE__)); -} - function showOwner($owner) { - -global $GALLERY_EMBEDDED_INSIDE_TYPE; -global $_CONF; /* Needed for GeekLog */ + global $GALLERY_EMBEDDED_INSIDE_TYPE; + global $_CONF; /* Needed for GeekLog */ switch ($GALLERY_EMBEDDED_INSIDE_TYPE) { case 'GeekLog': @@ -3409,47 +3028,48 @@ } function getExtraFieldsValues($index, $extra_fields, $full) { - global $gallery; - $photo = $gallery->album->getPhoto($index); - $automaticFields = automaticFieldsList(); + global $gallery; + $photo = $gallery->album->getPhoto($index); + $automaticFields = automaticFieldsList(); - $table=array(); + $table = array(); - foreach ($extra_fields as $key) { - if (isset($automaticFields[$key]) && $key != 'EXIF') { - if ($key == 'Upload Date') { - $table[$automaticFields[$key]] = strftime($gallery->app->dateTimeString , $gallery->album->getUploadDate($index)); - } + foreach ($extra_fields as $key) { + if (isset($automaticFields[$key]) && $key != 'EXIF') { + if ($key == 'Upload Date') { + $table[$automaticFields[$key]] = strftime($gallery->app->dateTimeString , $gallery->album->getUploadDate($index)); + } - if ($key == 'Capture Date') { - $itemCaptureDate = $gallery->album->getItemCaptureDate($index); - $table[$automaticFields[$key]] = strftime($gallery->app->dateTimeString , $itemCaptureDate); - } + if ($key == 'Capture Date') { + $itemCaptureDate = $gallery->album->getItemCaptureDate($index); + $table[$automaticFields[$key]] = strftime($gallery->app->dateTimeString , $itemCaptureDate); + } - if ($key == 'Dimensions') { - $dimensions=$photo->getDimensions($full); - $table[$automaticFields[$key]] = $dimensions[0]." x ".$dimensions[1]." (". ((int) $photo->getFileSize($full) >> 10) ."k)"; - } - } - else { - $value=$gallery->album->getExtraField($index, $key); - if ($value) { - $table[$key] = str_replace("\n", "
", $value); - } - } + if ($key == 'Dimensions') { + $dimensions = $photo->getDimensions($full); + $table[$automaticFields[$key]] = $dimensions[0]." x ".$dimensions[1]." (". ((int) $photo->getFileSize($full) >> 10) ."k)"; + } } - return $table; + else { + $value = $gallery->album->getExtraField($index, $key); + if (!empty($value)) { + /* Might be look strange, but $key could be in translateableFields() */ + $table[_($key)] = str_replace("\n", "
", $value); + } + } + } + return $table; } -/* -** This function displays tables with the Fields of an Photo -** $index => Fields of this photo are displayed. -** $extra_fields => You need to give the extrafields ; hint: use getExtraFields() -** $withExtraFields => if true, then the extra fields are displayed -** $withExif => if true, then the EXIF Data are displayed -** $full => Needed for getting dimensions of the photo -** $forceRefresh => Needed for getting EXIF Data -*/ +/** + * This function displays tables with the Fields of an Photo + * @param integer $index Fields of this photo are displayed. + * @param array $extra_fields You need to give the extrafields ; hint: use getExtraFields() + * @param boolean $withExtraFields if true, then the extra fields are displayed + * @param boolean $withExif if true, then the EXIF Data are displayed + * @param mixed $full Needed for getting dimensions of the photo + * @param boolean $forceRefresh Needed for getting EXIF Data + */ function displayPhotoFields($index, $extra_fields, $withExtraFields=true, $withExif=true, $full=NULL, $forceRefresh=0) { global $gallery; @@ -3457,23 +3077,20 @@ // if we have extra fiels and we want to show them, then get the values if (isset($extra_fields) && $withExtraFields) { - $CF=getExtraFieldsValues($index, $extra_fields, $full); - if ($CF) { - $tables = array("" => $CF); + $CF = getExtraFieldsValues($index, $extra_fields, $full); + if (!empty($CF)) { + $tables = array('' => $CF); } } - - if ($withExif && (isset($gallery->app->use_exif) || isset($gallery->app->exiftags)) && - (eregi("jpe?g\$", $photo->image->type))) { + if ($withExif && (isset($gallery->app->use_exif) || isset($gallery->app->exiftags)) && + (eregi("jpe?g\$", $photo->image->type))) { $myExif = $gallery->album->getExif($index, isset($forceRefresh)); if (!empty($myExif) && !isset($myExif['Error'])) { - // following line commented out because we were losing - // comments from the Exif array. This is probably due - // to differences in versions of jhead. - // array_pop($myExif); // get rid of empty element at end - array_shift($myExif); // get rid of file name at beginning + $tables[_("EXIF Data")] = $myExif; + } elseif (isset($myExif['status']) && $myExif['status'] == 1) { + echo '

'. _("Display of EXIF data enabled, but no data found.") .'

'; } } @@ -3482,41 +3099,16 @@ } foreach ($tables as $caption => $fields) { - echo "\n". ''; - echo "\n". ''; - - $i=0; - foreach ($fields as $key => $value) { - $i++; - echo "\n"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n"; - } - echo "\n
'. $caption .'
$key:$value
"; - } -} - -function emailComments($id, $comment_text, $commenter_name) { - global $gallery; - - $to = implode(", ", $gallery->album->getEmailMeList('comments', $id)); - if (strlen($to) > 0) { - $text=""; - $text.= sprintf("A comment has been added to %s by %s in album %s.", - makeAlbumUrl($gallery->session->albumName, $id), - $commenter_name, - makeAlbumUrl($gallery->session->albumName)); - $text.= "\n\n"."****BEGIN COMMENT****"."\n"; - $text.= str_replace("\r", "\n", str_replace("\r\n", "\n", $comment_text)); - $text.= "\n"."****END COMMENT****"."\n\n"; - $text .= "If you no longer wish to receive emails about this image, follow the links above and ensure that \"Email me when comments are added\" is unchecked in both the photo and album page (You'll need to login first)."; - $subject=sprintf("New comment for %s", $id); - $logmsg=sprintf("New comment for %s.", makeAlbumUrl($gallery->session->albumName, $id)); - gallery_mail($to, $subject, $text, $logmsg, true); - } elseif (isDebugging()) { - print _("No email sent as no valid email addresses were found"); + $customFieldsTable = new galleryTable(); + $customFieldsTable->setAttrs(array('class' => 'customFieldsTable')); + $customFieldsTable->setCaption($caption, 'customFieldsTableCaption'); + + foreach ($fields as $key => $value) { + $customFieldsTable->addElement(array('content' => $key)); + $customFieldsTable->addElement(array('content' => ':')); + $customFieldsTable->addElement(array('content' => $value)); + } + echo $customFieldsTable->render(); } } @@ -3620,8 +3212,7 @@ } } -return $count; - + return $count; } /* @@ -3649,57 +3240,211 @@ return $parentNameArray; } -function getIconText($iconName='', $altText='') { +function getIconText($iconName = '', $altText = '', $overrideMode = '', $useBrackets = true) { global $gallery; $text = $altText; - if (isset($gallery->app->useIcons) && $gallery->app->useIcons != "no") { - if ($gallery->app->useIcons == 'both') { + if (!empty($overrideMode)) { + $iconMode = $overrideMode; + } elseif (isset($gallery->app->useIcons)) { + $iconMode = $gallery->app->useIcons; + } else { + $iconMode = 'no'; + } + + if ($iconMode != "no" && $iconName != '') { + if ($iconMode == 'both') { $altText = ''; } - if(file_exists(dirname(__FILE__) .'/images/icons/'. $iconName)) { + + if (file_exists(dirname(__FILE__) .'/images/icons/'. $iconName)) { $imgSrc = $gallery->app->photoAlbumURL .'/images/icons/'. $iconName; $linkText = ''. $altText. ''; - if ($gallery->app->useIcons == "both") { + if ($iconMode == "both") { $linkText .= "
$text"; } } } if (empty($linkText)) { - $linkText = '['. $text . ']'; + if($useBrackets) { + $linkText = '['. $text . ']'; + } else { + $linkText = $text; + } } return $linkText; } -function makeIconMenu($iconElements, $closeTable = true) { - global $gallery; +function makeIconMenu($iconElements, $align = 'left', $closeTable = true, $linebreak = false) { + global $gallery; - if (empty($iconElements)) { - return ""; - } + if (empty($iconElements)) { + return ""; + } + + // For rtl/ltr stuff + if ($gallery->direction == 'rtl') { + $align = ($align == 'left') ? 'right' : 'left'; + } -// For rtl/ltr stuff - if ($gallery->direction == 'ltr') { - $align ='right'; + $html = "\n". ''; + $i = 0; + foreach ($iconElements as $element) { + $i++; + if (stristr($element,'')) { + $html .= "\n\t". ''; + } else { + $html .= "\n\t". ''; + } + if($i > sizeof($iconElements)/2 && $linebreak) { + $html .= "\n\n"; + $i=0; + } + } + + if ($closeTable == true) { + $html .= "\n"; + } + + return $html; +} + +/* Ecard Function begin */ +function get_ecard_template($template_name) { + global $gallery; + + $error = false; + $file_data = ""; + $fpread = @fopen(dirname(__FILE__) . '/includes/ecard/templates/'. $template_name, 'r'); + if (!$fpread) { + $error = true; } else { - $align ='left'; - } + while(! feof($fpread) ) { + $file_data .= fgets($fpread, 4096); + } + fclose($fpread); + } + return array($error,$file_data); +} - $html = "\n". ''; - foreach ($iconElements as $element) { - if (stristr($element,'')) { - $html .= "\n\t". ''; +function parse_ecard_template($ecard,$ecard_data) { + global $gallery; + + $ecard_data = preg_replace ("/<%ecard_sender_email%>/", $ecard["email_sender"], $ecard_data); + $ecard_data = preg_replace ("/<%ecard_sender_name%>/", $ecard["name_sender"], $ecard_data); + $ecard_data = preg_replace ("/<%ecard_image_name%>/", $ecard["image_name"], $ecard_data); + $ecard_data = preg_replace ("/<%ecard_message%>/", preg_replace ("/\r?\n/", "
\n", htmlspecialchars($ecard["message"])), $ecard_data); + $ecard_data = preg_replace ("/<%ecard_reciepient_email%>/", $ecard["email_recepient"], $ecard_data); + $ecard_data = preg_replace ("/<%ecard_reciepient_name%>/", $ecard["name_recepient"], $ecard_data); + $ecard_data = preg_replace ("/<%ecard_stamp%>/", $ecard["stamp"], $ecard_data); + + + $imagePath = $gallery->app->albumDir . str_replace ($gallery->app->albumDirURL, '', $ecard["image_name"]); + list ($width, $height) = getDimensions(urldecode($imagePath)); + $widthReplace = ($width < 200) ? 'width="500"' : ''; + $ecard_data = preg_replace ("/<%ecard_width%>/", $widthReplace, $ecard_data); + + return $ecard_data; + } + + function send_ecard($ecard,$ecard_HTML_data,$ecard_PLAIN_data) { + $ecard_mail = new htmlMimeMail(); + $ecard_image = $ecard_mail->getFile($ecard["image_name"]); + + if (preg_match_all("/()/Uim", $ecard_HTML_data, $matchArray)) { + for ($i=0; $igetFile($matchArray[2][$i]); + } + } + $ecard_mail->setHtml($ecard_HTML_data, $ecard_PLAIN_data,'./'); + $ecard_mail->setFrom($ecard["name_sender"].'<'.$ecard["email_sender"].'>'); + if (empty($ecard['subject'])) { + $ecard['subject'] = sprintf(_("%s sent you an E-C@rd."), $ecard["name_sender"]); + } + $ecard_mail->setSubject($ecard['subject']); + $ecard_mail->setReturnPath($ecard["email_sender"]); + + $result = $ecard_mail->send(array($ecard["email_recepient"])); + + return $result; + } + +/** + * This function is taken from + * http://www.phpinsider.com/smarty-forum/viewtopic.php?t=1079 + * + * @param array $data The array that is going to be sorted. + * @param string $sortby Field which the array is sorted by + * @param string $order Either 'asc' or 'desc' + * @param boolean $caseSensitive + * @param boolean $keepIndexes if set to true, then uasort instead of usort is used. + */ +function array_sort_by_fields(&$data, $sortby, $order = 'asc', $caseSensitive = true, $keepIndexes = false) { + static $sort_funcs = array(); + static $code; + + $order = ($order == 'asc') ? 1 : -1; + + if (empty($sort_funcs[$sortby])) { + if ($caseSensitive) { + $code = " + if( \$a['$sortby'] == \$b['$sortby'] ) { + return 0; + }; + if ( \$a['$sortby'] > \$b['$sortby'] ) { + return $order; + } else { + return -1 * $order; + }"; + } + else { + $code = " + if(strtoupper(\$a['$sortby']) == strtoupper(\$b['$sortby'])) { + return 0; + }; + if (strtoupper(\$a['$sortby']) > strtoupper(\$b['$sortby'])) { + return $order; + } else { + return -1 * $order; + }"; + } + + $sort_func = $sort_funcs[$sortby] = create_function('$a, $b', $code); } else { - $html .= "\n\t". ''; + $sort_func = $sort_funcs[$sortby]; } - } - if ($closeTable == true) { - $html .= ""; - } + debugMessage($code, __FILE__, __LINE__,3); + + if($keepIndexes) { + uasort($data, $sort_func); + } else { + usort($data, $sort_func); + } +} + +/** + * @param string Optional former searchh string + * @param string Optional alignment + * @return string HTML code that contains a form for entering the searchstring + * @author Jens Tkotz + */ +function addSearchForm($formerSearchString = '', $align = '') { + $html = ''; + + $html .= makeFormIntro('search.php', array( + 'name' => 'search_form', + 'method' => 'post', + 'style' => "text-align: $align", + 'class' => 'search') + ); + + $html .= "\t". _("Search:"); + $html .= ''; + $html .= "\n\n"; return $html; } @@ -3707,4 +3452,7 @@ require_once(dirname(__FILE__) . '/lib/lang.php'); require_once(dirname(__FILE__) . '/lib/Form.php'); require_once(dirname(__FILE__) . '/lib/voting.php'); +require_once(dirname(__FILE__) . '/lib/albumItem.php'); +require_once(dirname(__FILE__) . '/lib/mail.php'); + ?> diff -Naur gallery-1.5-pl1/Version.php gallery-1.5.1/Version.php --- gallery-1.5-pl1/Version.php 2005-08-29 16:39:54.000000000 +0200 +++ gallery-1.5.1/Version.php 2005-09-22 15:08:00.000000000 +0200 @@ -15,9 +15,9 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: Version.php,v 1.1317.2.28 2005/08/29 14:39:54 ckdake Exp $ + * $Id: Version.php,v 1.1443.2.32 2005/09/22 13:08:00 ckdake Exp $ */ ?> version = '1.5-pl1'; -$gallery->config_version = 91; -$gallery->album_version = 34; -$gallery->user_version = 5; +$gallery->version = '1.5.1'; +$gallery->config_version = 93; +$gallery->album_version = 37; +$gallery->user_version = 6; $gallery->url = "http://gallery.sourceforge.net"; /* do not edit the date!! modified by CVS */ -$gallery->last_change=strtotime(substr('$Date: 2005/08/29 14:39:54 $', 7, -1)); +$gallery->last_change = strtotime(substr('$Date: 2005/09/22 13:08:00 $', 7, -1)); /* * PostNuke version info */ @@ -54,9 +54,9 @@ $modversion['contact'] = $gallery->url; // The Authors Website or Contact Email Address $modversion['admin'] = 0; // Leave at 0 if (!isset($modname) && isset($name)) { - $modname = $name; + $modname = $name; } else { - $modname = ''; + $modname = ''; } $modversion['securityschema'] = array("$modname::" => '::'); // Permission Component ?> diff -Naur gallery-1.5-pl1/view_album.php gallery-1.5.1/view_album.php --- gallery-1.5-pl1/view_album.php 2005-04-14 03:48:27.000000000 +0200 +++ gallery-1.5.1/view_album.php 2005-09-22 02:29:50.000000000 +0200 @@ -1,24 +1,24 @@ session->albumName) || !$gallery->user->canReadAlbum($gallery->album) || !$gallery->album->isLoaded()) { - $gallery->session->gRedirDone = false; - header("Location: " . makeAlbumHeaderUrl('', '', array('gRedir' => 1))); - return; + $gallery->session->gRedirDone = false; + header("Location: " . makeAlbumHeaderUrl('', '', array('gRedir' => 1))); + return; } $gallery->session->offlineAlbums[$gallery->album->fields["name"]]=true; - -if (empty($page)) { +$page = intval($page); +if (empty($page) || $page < 0) { if (isset($gallery->session->albumPage[$gallery->album->fields['name']])) { - $page = $gallery->session->albumPage[$gallery->album->fields["name"]]; + $page = $gallery->session->albumPage[$gallery->album->fields["name"]]; } else { - $page = 1; + $page = 1; } } else { - $gallery->session->albumPage[$gallery->album->fields["name"]] = $page; + $gallery->session->albumPage[$gallery->album->fields["name"]] = $page; } $albumName = $gallery->session->albumName; if (!isset($gallery->session->viewedAlbum[$albumName]) && !$gallery->session->offline) { - $gallery->session->viewedAlbum[$albumName] = 1; - $gallery->album->incrementClicks(); -} + $gallery->session->viewedAlbum[$albumName] = 1; + $gallery->album->incrementClicks(); +} $rows = $gallery->album->fields["rows"]; $cols = $gallery->album->fields["cols"]; @@ -61,7 +61,7 @@ $maxPages = max(ceil(($numPhotos + $numAlbums) / $perPage), 1); if ($page > $maxPages) { - $page = $maxPages; + $page = $maxPages; } $start = ($page - 1) * $perPage + 1; @@ -69,26 +69,26 @@ $nextPage = $page + 1; if ($nextPage > $maxPages) { - $nextPage = 1; - $last = 1; + $nextPage = 1; + $last = 1; } $previousPage = $page - 1; if ($previousPage == 0) { - $previousPage = $maxPages; - $first = 1; + $previousPage = $maxPages; + $first = 1; } if (!empty($Vote)) { - if ($gallery->album->getPollScale() == 1 && $gallery->album->getPollType() != "rank") { - for ($index=$start; $index < $start+$perPage; $index ++) { - $id=$gallery->album->getPhotoId($index); - if (!$votes[$id]) { - $votes[$id]=null; - } - } - } - saveResults($votes); + if ($gallery->album->getPollScale() == 1 && $gallery->album->getPollType() != "rank") { + for ($index=$start; $index < $start+$perPage; $index ++) { + $id=$gallery->album->getPhotoId($index); + if (!$votes[$id]) { + $votes[$id]=null; + } + } + } + saveResults($votes); } $bordercolor = $gallery->album->fields["bordercolor"]; @@ -106,12 +106,12 @@ $fullWidth = $navigator["fullWidth"] . $navigator["widthUnits"]; $upArrowURL = ''; +'alt="' . _("navigate UP") .'" title="' . _("navigate UP") .'" border="0">'; if ($gallery->album->fields['returnto'] != 'no') { foreach ($gallery->album->getParentAlbums() as $navAlbum) { - $breadcrumb["text"][] = $navAlbum['prefixText'] .': '. - $navAlbum['title'] . " " . $upArrowURL . ""; + $breadcrumb["text"][] = $navAlbum['prefixText'] .': '. + $navAlbum['title'] . " " . $upArrowURL . ""; } } @@ -119,7 +119,7 @@ global $GALLERY_EMBEDDED_INSIDE; if (!$GALLERY_EMBEDDED_INSIDE) { - doctype(); + doctype(); ?> @@ -139,23 +139,23 @@ album->isRoot() && - (!$gallery->session->offline || +(!$gallery->session->offline || isset($gallery->session->offlineAlbums["albums.php"]))) { ?> session->offline || + } else if (!$gallery->session->offline || isset($gallery->session->offlineAlbums[$pAlbum->fields['parentAlbumName']])) { ?> session->offline || +if (!$gallery->session->offline || isset($gallery->session->offlineAlbums["albums.php"])) { ?> -session->offline) { ?> @@ -187,278 +189,231 @@ + //--> session->albumName; - } - $args['type'] = 'popup'; - echo "\t\n"; -} - $adminText = ''; $albums_str= pluralize_n2(ngettext("1 sub-album", "%d sub-albums",$numAlbums), $numAlbums, _("No albums")); $imags_str= pluralize_n2(ngettext("1 image", "%d images", $numPhotos), $numPhotos, _("no images")); $pages_str=pluralize_n2(ngettext("1 page", "%d pages", $maxPages), $maxPages, _("0 pages")); if ($numAlbums && $maxPages > 1) { - $adminText .= sprintf(_("%s and %s in this album on %s"), - $albums_str, $imags_str, $pages_str); + $adminText .= sprintf(_("%s and %s in this album on %s"), + $albums_str, $imags_str, $pages_str); } else if ($numAlbums) { - $adminText .= sprintf(_("%s and %s in this album"), - $albums_str, $imags_str); + $adminText .= sprintf(_("%s and %s in this album"), + $albums_str, $imags_str); } else if ($maxPages > 1) { - $adminText .= sprintf(_("%s in this album on %s"), - $imags_str, $pages_str); + $adminText .= sprintf(_("%s in this album on %s"), + $imags_str, $pages_str); } else { - $adminText .= sprintf(_("%s in this album"), - $imags_str); + $adminText .= sprintf(_("%s in this album"), + $imags_str); } -if ($gallery->user->canWriteToAlbum($gallery->album) && - !$gallery->session->offline) { - $hidden = $gallery->album->numHidden(); - $verb = _("%s are hidden"); - if ($hidden == 1) { - $verb = _("%s is hidden"); - } - if ($hidden) { - $adminText .= "(".sprintf($verb, $hidden).")"; - } -} +if ($gallery->user->canWriteToAlbum($gallery->album) && +!$gallery->session->offline) { + $hidden = $gallery->album->numHidden(); + $verb = _("%s are hidden"); + if ($hidden == 1) { + $verb = _("%s is hidden"); + } + if ($hidden) { + $adminText .= "(".sprintf($verb, $hidden).")"; + } +} /* admin items for drop-down menu */ $adminOptions = array( - 'add_photos' => array('name' => _('add photos'), - 'requirements' => array('canAddToAlbum'), - 'action' => 'popup', - 'value' => makeGalleryUrl('add_photos_frame.php', - array('set_albumName' => $gallery->session->albumName, - 'type' => 'popup'))), - 'rename_album' => array('name' => _('rename album'), - 'requirements' => array('isAdminOrAlbumOwner'), - 'action' => 'popup', - 'value' => makeGalleryUrl('rename_album.php', - array('set_albumName' => $gallery->session->albumName, - 'type' => 'popup', - 'useLoad' => 1))), - 'nested_album' => array('name' => _('new nested album'), - 'requirements' => array('canCreateSubAlbum', - 'notOffline'), - 'action' => 'url', - 'value' => doCommand('new-album', array('parentName' => $gallery->session->albumName), - 'view_album.php')), - 'custom_fields' => array('name' => _('custom fields'), - 'requirements' => array('canChangeText', - 'notOffline'), - 'action' => 'popup', - 'value' => makeGalleryUrl('extra_fields.php', - array('set_albumName' => $gallery->session->albumName, - 'type' => 'popup'))), - 'edit_captions' => array('name' => _('edit captions'), - 'requirements' => array('canChangeText', - 'notOffline'), - 'action' => 'url', - 'value' => makeGalleryUrl('captionator.php', - array('set_albumName' => $gallery->session->albumName, - 'page' => $page, 'perPage' => $perPage))), - 'sort_items' => array('name' => _('sort items'), - 'requirements' => array('canWriteToAlbum', - 'photosExist'), - 'action' => 'popup', - 'value' => makeGalleryUrl('sort_album.php', - array('set_albumName' => $gallery->session->albumName, - 'type' => 'popup'))), - 'resize_all' => array('name' => _('resize all'), - 'requirements' => array('canWriteToAlbum', - 'photosExist'), - 'action' => 'popup', - 'value' => makeGalleryUrl('resize_photo.php', - array('set_albumName' => $gallery->session->albumName, - 'index' => 'all', - 'type' => 'popup'))), - 'rebuild_thumbs' => array('name' => _('rebuild thumbs'), - 'requirements' => array('canWriteToAlbum', - 'photosExist'), - 'action' => 'popup', - 'value' => doCommand('remake-thumbnail', - array('set_albumName' => $gallery->session->albumName, - 'index' => 'all', 'type' => 'popup'))), - 'properties' => array('name' => _('properties'), - 'requirements' => array('canWriteToAlbum'), - 'action' => 'popup', - 'value' => makeGalleryUrl('edit_appearance.php', - array('set_albumName' => $gallery->session->albumName, - 'type' => 'popup'))), - 'permissions' => array('name' => _('permissions'), - 'requirements' => array('isAdminOrAlbumOwner'), - 'action' => 'popup', - 'value' => makeGalleryUrl('album_permissions.php', - array('set_albumName' => $gallery->session->albumName, - 'type' => 'popup'))), - 'poll_properties' => array('name' => _('poll properties'), - 'requirements' => array('isAdminOrAlbumOwner'), - 'action' => 'popup', - 'value' => makeGalleryUrl('poll_properties.php', - array('set_albumName' => $gallery->session->albumName, - 'type' => 'popup'))), - 'poll_results' => array('name' => _('poll results'), - 'requirements' => array('isAdminOrAlbumOwner'), - 'action' => 'url', - 'value' => makeGalleryUrl('poll_results.php', - array('set_albumName' => $gallery->session->albumName, - ))), - 'poll_reset' => array('name' => _('poll reset'), - 'requirements' => array('isAdminOrAlbumOwner'), - 'action' => 'popup', - 'value' => makeGalleryUrl('reset_votes.php', - array('set_albumName' => $gallery->session->albumName, - 'type' => 'popup'))), - 'view_comments' => array('name' => _('view comments'), - 'requirements' => array('isAdminOrAlbumOwner', - 'allowComments', - 'comments_enabled', - 'hasComments'), - 'action' => 'url', - 'value' => makeGalleryUrl('view_comments.php', - array('set_albumName' => $gallery->session->albumName))), - 'watermark_album' => array('name' => _('watermark album'), - 'requirements' => array('isAdminOrAlbumOwner', - 'photosExist', - 'watermarkingEnabled'), - 'action' => 'popup', - 'value' => makeGalleryUrl('watermark_album.php', - array('set_albumName' => $gallery->session->albumName, - 'type' => 'popup'))), + 'add_photos' => array( + 'name' => _('add photos'), + 'requirements' => array('canAddToAlbum'), + 'action' => 'popup', + 'value' => makeGalleryUrl('add_photos_frame.php', + array('set_albumName' => $gallery->session->albumName, 'type' => 'popup'))), + 'rename_album' => array( + 'name' => _('rename album'), + 'requirements' => array('isAdminOrAlbumOwner'), + 'action' => 'popup', + 'value' => makeGalleryUrl('rename_album.php', array( + 'set_albumName' => $gallery->session->albumName, + 'type' => 'popup', 'useLoad' => 1))), + 'nested_album' => array( + 'name' => _('new nested album'), + 'requirements' => array('canCreateSubAlbum', 'notOffline'), + 'action' => 'url', + 'value' => doCommand('new-album', + array('parentName' => $gallery->session->albumName), 'view_album.php')), + 'edit_captions' => array( + 'name' => _('edit captions'), + 'requirements' => array('canChangeText','notOffline'), + 'action' => 'url', + 'value' => makeGalleryUrl('captionator.php', + array('set_albumName' => $gallery->session->albumName, 'page' => $page, 'perPage' => $perPage))), + 'sort_items' => array( + 'name' => _('sort items'), + 'requirements' => array('canWriteToAlbum', 'photosExist'), + 'action' => 'popup', + 'value' => makeGalleryUrl('sort_album.php', + array('set_albumName' => $gallery->session->albumName, 'type' => 'popup'))), + 'resize_all' => array( + 'name' => _('resize all'), + 'requirements' => array('canWriteToAlbum', 'photosExist'), + 'action' => 'popup', + 'value' => makeGalleryUrl('resize_photo.php', + array('set_albumName' => $gallery->session->albumName, 'index' => 'all', 'type' => 'popup'))), + 'rebuild_thumbs' => array( + 'name' => _('rebuild thumbs'), + 'requirements' => array('canWriteToAlbum', 'photosExist'), + 'action' => 'popup', + 'value' => doCommand('remake-thumbnail', + array('set_albumName' => $gallery->session->albumName, 'index' => 'all', 'type' => 'popup'))), + 'properties' => array( + 'name' => _('properties'), + 'requirements' => array('canWriteToAlbum'), + 'action' => 'popup', + 'value' => makeGalleryUrl('edit_appearance.php', + array('set_albumName' => $gallery->session->albumName, 'type' => 'popup'))), + 'rearrange' => array( + 'name' => _('rearrange items'), + 'requirements' => array('canWriteToAlbum', 'photosExist'), + 'action' => 'popup', + 'value' => makeGalleryUrl('rearrange.php', + array('set_albumName' => $gallery->session->albumName, 'type' => 'popup'))), + 'permissions' => array('name' => _('permissions'), + 'requirements' => array('isAdminOrAlbumOwner'), + 'action' => 'popup', + 'value' => makeGalleryUrl('album_permissions.php', + array('set_albumName' => $gallery->session->albumName, 'type' => 'popup'))), + 'poll_results' => array( + 'name' => _('poll results'), + 'requirements' => array('isAdminOrAlbumOwner'), + 'action' => 'url', + 'value' => makeGalleryUrl('poll_results.php', + array('set_albumName' => $gallery->session->albumName,))), + 'poll_reset' => array( + 'name' => _('poll reset'), + 'requirements' => array('isAdminOrAlbumOwner'), + 'action' => 'popup', + 'value' => makeGalleryUrl('reset_votes.php', + array('set_albumName' => $gallery->session->albumName, 'type' => 'popup'))), + 'view_comments' => array( + 'name' => _('view comments'), + 'requirements' => array('isAdminOrAlbumOwner', 'allowComments', 'comments_enabled', 'hasComments'), + 'action' => 'url', + 'value' => makeGalleryUrl('view_comments.php', + array('set_albumName' => $gallery->session->albumName))), + 'watermark_album' => array( + 'name' => _('watermark album'), + 'requirements' => array('isAdminOrAlbumOwner','photosExist','watermarkingEnabled'), + 'action' => 'popup', + 'value' => makeGalleryUrl('watermark_album.php', + array('set_albumName' => $gallery->session->albumName, 'type' => 'popup'))), ); /* sort the drop-down array by translated name */ -function sortJSAdmin($a, $b) { - return strcmp($a['name'], $b['name']); -} -uasort($adminOptions, "sortJSAdmin"); -reset($adminOptions); +array_sort_by_fields($adminOptions, 'name', 'asc', true, true); $adminOptionHTML = ''; $adminJavaScript = ''; /* determine which options to include in admin drop-down menu */ if (!$gallery->session->offline) { - foreach ($adminOptions as $key => $data) { - $enabled = true; - while ($enabled && $test = array_shift($data['requirements'])) { - $success = testRequirement($test); - if (!$success) { - $enabled = false; - } + foreach ($adminOptions as $key => $data) { + $enabled = true; + while ($enabled && $test = array_shift($data['requirements'])) { + $success = testRequirement($test); + if (!$success) { + $enabled = false; + } + } + if ($enabled) { + $adminOptionHTML .= "\t\t\n"; + $adminJavaScript .= "adminOptions.$key = new Object;\n"; + $adminJavaScript .= "adminOptions.$key.action = \"${data['action']}\";\n"; + /* We need to pass un-html-entityified URLs to the JavaScript + * This line effectively reverses htmlentities() */ + $decodeHtml = unhtmlentities($data['value']); + $adminJavaScript .= "adminOptions.$key.value = \"${decodeHtml}\";\n"; + } } - if ($enabled) { - $adminOptionHTML .= "\t\t\n"; - $adminJavaScript .= "adminOptions.$key = new Object;\n"; - $adminJavaScript .= "adminOptions.$key.action = \"${data['action']}\";\n"; - /* We need to pass un-html-entityified URLs to the JavaScript - * This line effectively reverses htmlentities() */ - $decodeHtml = unhtmlentities($data['value']); - $adminJavaScript .= "adminOptions.$key.value = \"${decodeHtml}\";\n"; - } - } } $adminCommands = ''; $adminJSFrame = ''; /* build up drop-down menu and related javascript */ if (!empty($adminOptionHTML)) { - $adminJSFrame .= "\n\n"; - - $iconElements[] = "\n\t\n"; -} - -if ($gallery->album->fields["slideshow_type"] != "off" && - ($numPhotos != 0 || ($numVisibleItems != 0 && $gallery->album->fields['slideshow_recursive'] == "yes"))) { - $iconText = getIconText('display.gif', _("slideshow")); - $iconElements[] = ' $albumName)) .'">'. $iconText .''; + $adminJSFrame .= "\n\n"; + + $iconElements[] = "\n\t\n"; +} + +if ($gallery->album->fields["slideshow_type"] != "off" && +($numPhotos != 0 || ($numVisibleItems != 0 && $gallery->album->fields['slideshow_recursive'] == "yes"))) { + $iconText = getIconText('display.gif', _("slideshow")); + $iconElements[] = ' $albumName)) .'">'. $iconText .''; } /* User is allowed to view ALL comments */ -if ( ($gallery->app->comments_enabled == 'yes' && $gallery->album->lastCommentDate("no") != -1) && - ((isset($gallery->app->comments_overview_for_all) && $gallery->app->comments_overview_for_all == "yes") || - $gallery->user->canViewComments($gallery->album))) { - $iconText = getIconText('showcomment.gif', _("view comments")); - $iconElements[] = ' $gallery->session->albumName)) . '">'. $iconText .''; +if ( $numVisibleItems != 0 && ($gallery->app->comments_enabled == 'yes' && $gallery->album->lastCommentDate("no") != -1) && +((isset($gallery->app->comments_overview_for_all) && $gallery->app->comments_overview_for_all == "yes") || +$gallery->user->canViewComments($gallery->album))) { + $iconText = getIconText('showcomment.gif', _("view comments")); + $iconElements[] = ' $gallery->session->albumName)) . '">'. $iconText .''; } if (!$GALLERY_EMBEDDED_INSIDE && !$gallery->session->offline) { - if ($gallery->user->isLoggedIn()) { - $iconText = getIconText('exit.gif', _("logout")); - $iconElements[] = ' $page, 'set_albumName' => $albumName)) .'">'. $iconText .''; - } else { - $iconText = getIconText('identity.gif', _("login")); - $iconElements[] = popup_link($iconText, "login.php", false, true, 500, 500); - } + if ($gallery->user->isLoggedIn()) { + $iconText = getIconText('exit.gif', _("logout")); + $iconElements[] = ' $page, 'set_albumName' => $albumName)) .'">'. $iconText .''; + } else { + $iconText = getIconText('identity.gif', _("login")); + $iconElements[] = popup_link($iconText, "login.php", false, true, 500, 500); + } } $adminbox["text"] = $adminText; -$adminbox["commands"] = $adminCommands . makeIconMenu($iconElements); +$adminbox["commands"] = $adminCommands . makeIconMenu($iconElements, 'right'); $adminbox["bordercolor"] = $bordercolor; if (!empty($adminOptionHTML)) { @@ -473,140 +428,145 @@ $breadcrumb["top"] = true; $breadcrumb['bottom'] = false; if (!empty($breadcrumb["text"])) { - includeLayout('navtablemiddle.inc'); - includeLayout('breadcrumb.inc'); + includeLayout('navtablemiddle.inc'); + includeLayout('breadcrumb.inc'); +} +if ($navigator["maxPages"] > 1) { + includeLayout('navtablemiddle.inc'); + includeLayout('navigator.inc'); } -includeLayout('navtablemiddle.inc'); -includeLayout('navigator.inc'); includeLayout('navtableend.inc'); #-- if borders are off, just make them the bgcolor ---- $borderwidth = $gallery->album->fields["border"]; if ($borderwidth == 0) { - $bordercolor = $gallery->album->fields["bgcolor"]; - $borderwidth = 1; + $bordercolor = $gallery->album->fields["bgcolor"]; + $borderwidth = 1; } if ($page == 1 && !empty($gallery->album->fields["summary"])) { - echo '

'. $gallery->album->fields["summary"] . '

'; + echo '

'. $gallery->album->fields["summary"] . '

'; } if (($gallery->album->getPollType() == "rank") && canVote()) { - echo '
'; - $my_choices=array(); - if ( $gallery->album->fields["votes"]) { - foreach ($gallery->album->fields["votes"] as $id => $image_votes) { - $index=$gallery->album->getIndexByVotingId($id); - if ($index < 0) { - // image has been deleted! - unset($gallery->album->fields["votes"][$id]); - continue; - } - if (isset($image_votes[getVotingID()])) { - $my_choices[$image_votes[getVotingID()]] = $id; - } - } - } - if (sizeof($my_choices) == 0 - && $gallery->album->getVoterClass() == "Logged in") { - print _("You have no votes recorded for this poll."). '
'; - } - else if (sizeof($my_choices) > 0) { - ksort($my_choices); - print _("Your current choices are"); - print "\n"; - $nv_pairs=$gallery->album->getVoteNVPairs(); - foreach ($my_choices as $key => $id) { - print "\n"; - $index=$gallery->album->getIndexByVotingId($id); - if ($gallery->album->isAlbum($index)) { - $albumName = $gallery->album->getAlbumName($index); - print "\n"; - } else { - print "\n"; - } - } - print "
". - $nv_pairs[$key]["name"]. - ":\n"; - $myAlbum = new Album(); - $myAlbum->load($albumName); - print sprintf(_("Album: %s"), $myAlbum->fields['title']); - print "
session->albumName, $id); - print ">\n"; - $desc = $gallery->album->getCaption($index); - if (trim($desc) == "") { - $desc=$gallery->album->getPhotoId($index); - } - print $desc; - print "
\n"; - } - echo '
'; + echo '
'; + $my_choices=array(); + if ( $gallery->album->fields["votes"]) { + foreach ($gallery->album->fields["votes"] as $id => $image_votes) { + $index=$gallery->album->getIndexByVotingId($id); + if ($index < 0) { + // image has been deleted! + unset($gallery->album->fields["votes"][$id]); + continue; + } + if (isset($image_votes[getVotingID()])) { + $my_choices[$image_votes[getVotingID()]] = $id; + } + } + } + if (sizeof($my_choices) == 0 + && $gallery->album->getVoterClass() == "Logged in") { + print _("You have no votes recorded for this poll."). '
'; + } + else if (sizeof($my_choices) > 0) { + ksort($my_choices); + print _("Your current choices are"); + print "\n"; + $nv_pairs=$gallery->album->getVoteNVPairs(); + foreach ($my_choices as $key => $id) { + print "\n"; + $index=$gallery->album->getIndexByVotingId($id); + if ($gallery->album->isAlbum($index)) { + $albumName = $gallery->album->getAlbumName($index); + print "\n"; + } else { + print "\n"; + } + } + print "
". + $nv_pairs[$key]["name"]. + ":\n"; + $myAlbum = new Album(); + $myAlbum->load($albumName); + print sprintf(_("Album: %s"), $myAlbum->fields['title']); + print "
session->albumName, $id); + print ">\n"; + $desc = $gallery->album->getCaption($index); + if (trim($desc) == "") { + $desc=$gallery->album->getPhotoId($index); + } + print $desc; + print "
\n"; + } + echo '
'; } $results=1; if ($gallery->album->getPollShowResults()) { - echo '
'; - list($buf, $results)=showResultsGraph( $gallery->album->getPollNumResults()); - print $buf; - if ($results && testRequirement('isAdminOrAlbumOwner')) { - print "\n". ' $gallery->session->albumName)). - '">' ._("See full poll results") . '
'; - } - echo '
'; + echo '
'; + list($buf, $results)=showResultsGraph( $gallery->album->getPollNumResults()); + print $buf; + if ($results && testRequirement('isAdminOrAlbumOwner')) { + print "\n". ' $gallery->session->albumName)). + '">' ._("See full poll results") . '
'; + } + echo '
'; } -echo makeFormIntro("view_album.php", - array("name" => "vote_form", "method" => "POST", "style" => "margin-bottom: 0px;")); -if (canVote()) { - echo '
'; - $nv_pairs=$gallery->album->getVoteNVPairs(); - if ($gallery->album->getPollScale()==1) { - $options = $nv_pairs[0]["name"]; - } - else { - /* note to translators: - ** This produces (in English) a list of the form: "a, b, c or d". Correct translation - ** of ", " and " or " should produce a version that makes sense in your language. - */ - $options = ""; - for ($count=0; $count < $gallery->album->getPollScale()-2 ; $count++) { - $options .= $nv_pairs[$count]["name"]._(", "); - } - $options .= $nv_pairs[$count++]["name"]._(" 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").""); - if ($gallery->album->getPollType() == "rank") { - $voteCount=$gallery->album->getPollScale(); - print " ". - sprintf(_("You have a total of %s and can change them if you wish."), - pluralize_n2(ngettext("1 vote", "%d votes", $voteCount), $voteCount)); - } - else { - print " "._("You can change your choices if you wish."); - } - echo "

"; ?> + + "vote_form", "method" => "POST", "style" => "margin-bottom: 0px;")); +if (canVote()) { + echo '
'; + $nv_pairs=$gallery->album->getVoteNVPairs(); + if ($gallery->album->getPollScale()==1) { + $options = $nv_pairs[0]["name"]; + } + else { + /* note to translators: + ** This produces (in English) a list of the form: "a, b, c or d". Correct translation + ** of ", " and " or " should produce a version that makes sense in your language. + */ + $options = ""; + for ($count=0; $count < $gallery->album->getPollScale()-2 ; $count++) { + $options .= $nv_pairs[$count]["name"]._(", "); + } + $options .= $nv_pairs[$count++]["name"]._(" 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").""); + if ($gallery->album->getPollType() == "rank") { + $voteCount=$gallery->album->getPollScale(); + print " ". + sprintf(_("You have a total of %s and can change them if you wish."), + pluralize_n2(ngettext("1 vote", "%d votes", $voteCount), $voteCount)); + } + else { + print " "._("You can change your choices if you wish."); + } + echo ""; +?>
@@ -623,444 +583,317 @@ $displayCommentLegend = 0; // this determines if we display "* Item contains a comment" at end of page if ($numPhotos) { - $rowCount = 0; + $rowCount = 0; - // Find the correct starting point, accounting for hidden photos - $rowStart = 0; - $cnt = 0; - $form_pos=0; // counts number of images that have votes below, ie withou albums; - $rowStart = $start; - - while ($rowCount < $rows) { - /* Do the inline_albumthumb header row */ - $visibleItemIndex = $rowStart; - $i = $visibleItemIndex<=$numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; - $j = 1; - $printTableRow = false; - if ($j <= $cols && $i <= $numPhotos) { - $printTableRow = true; - } - while ($j <= $cols && $i <= $numPhotos) { - $j++; - $visibleItemIndex++; - $i = $visibleItemIndex <= $numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; - } - if ($printTableRow) { - } - - /* Do the picture row */ - $visibleItemIndex = $rowStart; - $i = $visibleItemIndex <= $numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; - $j = 1; - if ($printTableRow) { - echo(''); - } - while ($j <= $cols && $i <= $numPhotos) { - echo("\n"); - - //-- put some parameters for the wrap files in the global object --- - $gallery->html_wrap['borderColor'] = $bordercolor; - $borderwidth= $gallery->html_wrap['borderWidth'] = $borderwidth; - $gallery->html_wrap['pixelImage'] = getImagePath('pixel_trans.gif'); - - - - if ($gallery->album->isAlbum($i)) { - $scaleTo = 0; //$gallery->album->fields["thumb_size"]; - $myAlbum = $gallery->album->getNestedAlbum($i); - list($iWidth, $iHeight) = $myAlbum->getHighlightDimensions($scaleTo); - } else { - unset($myAlbum); - $scaleTo=0; // thumbs already the right - // size for this album - list($iWidth, $iHeight) = $gallery->album->getThumbDimensions($i, $scaleTo); - } - if ($iWidth == 0) { - $iWidth = $gallery->album->fields["thumb_size"]; - } - if ($iHeight == 0) { - $iHeight = 100; - } - - $gallery->html_wrap['imageWidth'] = $iWidth; - $gallery->html_wrap['imageHeight'] = $iHeight; - - $id = $gallery->album->getPhotoId($i); - if ($gallery->album->isMovieByIndex($i)) { - $gallery->html_wrap['imageTag'] = $gallery->album->getThumbnailTag($i); - $gallery->html_wrap['imageHref'] = makeAlbumUrl($gallery->session->albumName, $id); - $frame= $gallery->html_wrap['frame'] = $gallery->album->fields['thumb_frame']; - /*begin backwards compatibility */ - $gallery->html_wrap['thumbTag'] = $gallery->html_wrap['imageTag']; - $gallery->html_wrap['thumbHref'] = $gallery->html_wrap['imageHref']; - /*end backwards compatibility*/ - list($divCellWidth, $divCellHeight, $padding) = calcVAdivDimension($frame, $iHeight, $iWidth, $borderwidth); - // If there is only one column, we don't need to try and match row heights - if ($cols == 1) { - $padding = 0; - } - echo "
\n"; - - includeHtmlWrap('inline_moviethumb.frame'); - } elseif (isset($myAlbum)) { - // We already loaded this album - don't do it again, for performance reasons. - - $gallery->html_wrap['imageTag'] = $myAlbum->getHighlightTag($scaleTo,'',_("Highlight for Album:"). " ". gallery_htmlentities(removeTags($myAlbum->fields['title']))); - $gallery->html_wrap['imageHref'] = makeAlbumUrl($gallery->album->getAlbumName($i)); - $frame= $gallery->html_wrap['frame'] = $gallery->album->fields['album_frame']; - /*begin backwards compatibility */ - $gallery->html_wrap['thumbWidth'] = $gallery->html_wrap['imageWidth']; - $gallery->html_wrap['thumbHeight'] = $gallery->html_wrap['imageHeight']; - $gallery->html_wrap['thumbTag'] = $gallery->html_wrap['imageTag']; - $gallery->html_wrap['thumbHref'] = $gallery->html_wrap['imageHref']; - /*end backwards compatibility*/ - - list($divCellWidth,$divCellHeight, $padding) = calcVAdivDimension($frame, $iHeight, $iWidth, $borderwidth); - echo "
\n"; - includeHtmlWrap('inline_albumthumb.frame'); - } else { - $gallery->html_wrap['imageTag'] = $gallery->album->getThumbnailTag($i); - $gallery->html_wrap['imageHref'] = makeAlbumUrl($gallery->session->albumName, $id); - $frame= $gallery->html_wrap['frame'] = $gallery->album->fields['thumb_frame']; - /*begin backwards compatibility */ - $gallery->html_wrap['thumbTag'] = $gallery->html_wrap['imageTag']; - $gallery->html_wrap['thumbHref'] = $gallery->html_wrap['imageHref']; - /*end backwards compatibility*/ - - list($divCellWidth,$divCellHeight, $padding) = calcVAdivDimension($frame, $iHeight, $iWidth, $borderwidth); - echo "
\n"; - includeHtmlWrap('inline_photothumb.frame'); - } - - echo "\n"; - echo "
\n"; - - if (canVote()){ - if ($gallery->album->fields["poll_type"] == 'rank' && $divCellWidth < 200) { - $divCellWidth=200; - } - } - - echo "
\n"; - /* Do the clickable-dimensions row */ - if (!strcmp($gallery->album->fields['showDimensions'], 'yes')) { - echo ''; - $photo = $gallery->album->getPhoto($i); - $image = $photo->image; - if (!empty($image) && !$photo->isMovie()) { - $viewFull = $gallery->user->canViewFullImages($gallery->album); - $fullOnly = (isset($gallery->session->fullOnly) && - !strcmp($gallery->session->fullOnly, 'on') && - !strcmp($gallery->album->fields['use_fullOnly'], 'yes')); - list($wr, $hr) = $image->getDimensions(); - list($wf, $hf) = $image->getRawDimensions(); - /* display file sizes if dimensions are identical */ - if ($wr == $wf && $hr == $hf && $viewFull && $photo->isResized()) { - $fsr = ' ' . sprintf(_('%dkB'), (int) $photo->getFileSize(0) >> 10); - $fsf = ' ' . sprintf(_('%dkB'), (int) $photo->getFileSize(1) >> 10); - } else { - $fsr = ''; - $fsf = ''; - } - if (($photo->isResized() && !$fullOnly) || !$viewFull) { - echo '[${wr}x{$hr}${fsr}] "; - } - if ($viewFull) { - echo '[${wf}x${hf}${fsf}]"; - } - } else { - echo " "; - } - echo ''; - - } - - /* Now do the caption row */ - if ($gallery->album->isAlbum($i)) { - $myAlbum = new Album; - $myAlbum->load($gallery->album->getAlbumName($i)); - } - else { - $myAlbum = NULL; - } - - if ($gallery->album->isAlbum($i)) { - $iWidth = $gallery->album->fields['thumb_size']; - } else { - list($iWidth, $iHeight) = $gallery->album->getThumbDimensions($i); - } - - // put form outside caption to compress lines - if (!$gallery->session->offline && - (($gallery->user->canDeleteFromAlbum($gallery->album)) || - ($gallery->user->canWriteToAlbum($gallery->album)) || - ($gallery->user->canChangeTextOfAlbum($gallery->album)) || - (($gallery->album->getItemOwnerModify() || $gallery->album->getItemOwnerDelete()) && - ($gallery->album->isItemOwner($gallery->user->getUid(), $i) || - (isset($myAlbum) && $gallery->user->isOwnerOfAlbum($myAlbum)))))) - { - $showAdminForm = 1; - } else { - $showAdminForm = 0; - } - - // Caption itself - echo "\n
\n"; - $id = $gallery->album->getPhotoId($i); - if ($gallery->album->isHidden($i) && !$gallery->session->offline) { - echo "(" . _("hidden") .")
"; - } - $photo = $gallery->album->getPhoto($i); - if ($gallery->user->canWriteToAlbum($gallery->album) && - $photo->isHighlight() && !$gallery->session->offline) { - echo "(" . _("highlight") .")
"; - } - if (isset($myAlbum)) { - $myDescription = $myAlbum->fields['description']; - $buf = ""; - $buf = $buf."
". sprintf(_("Album: %s"), ''. $myAlbum->fields['title'] .''). '
'; - if ($myDescription != _("No description") && - $myDescription != "No description" && - $myDescription != "") { - $buf = $buf."
".$myDescription.""; - } - echo $buf; - - echo '
'; - echo _("Changed: ") ." ". $myAlbum->getLastModificationDate(); - echo "\n
"; - $visItems=array_sum($myAlbum->numVisibleItems($gallery->user)); - echo _("Contains: ") ." ". pluralize_n2(ngettext("1 item", "%d items", $visItems), $visItems) . '. '; - // If comments indication for either albums or both - switch ($gallery->app->comments_indication) { - - case "albums": - case "both": - $lastCommentDate = $myAlbum->lastCommentDate( - $gallery->app->comments_indication_verbose); - if ($lastCommentDate > 0) { - print lastCommentString($lastCommentDate, $displayCommentLegend); - } - } - echo '
'; - - if (!(strcmp($gallery->album->fields["display_clicks"] , "yes")) && !$gallery->session->offline && ($myAlbum->getClicks() > 0)) { - echo '
'; - echo _("Viewed:") . " ". pluralize_n2(ngettext("1 time", "%d times", $myAlbum->getClicks()), $myAlbum->getClicks()); - echo ".
"; - } - } - else { - echo "
\n"; - echo nl2br($gallery->album->getCaption($i)); - echo $gallery->album->getCaptionName($i) . ' '; - // indicate with * if we have a comment for a given photo - if ($gallery->user->canViewComments($gallery->album) - && $gallery->app->comments_enabled == 'yes') { - // If comments indication for either photos or both - switch ($gallery->app->comments_indication) { - case "photos": - case "both": - $lastCommentDate = $gallery->album->itemLastCommentDate($i); - print lastCommentString($lastCommentDate, $displayCommentLegend); - } - - } - echo "
\n"; - - if (!(strcmp($gallery->album->fields["display_clicks"] , "yes")) && !$gallery->session->offline && ($gallery->album->getItemClicks($i) > 0)) { - echo '
'; - echo _("Viewed:") ." ". pluralize_n2(ngettext("1 time", "%d times", $gallery->album->getItemClicks($i)), $gallery->album->getItemClicks($i)); - echo ".
\n"; - } - } - echo "
\n"; - // End Caption - - if (canVote()) { - echo("
\n"); - addPolling($gallery->album->getVotingIdByIndex($i), - $form_pos, false); - $form_pos++; - } - - if ($showAdminForm) { - if ($gallery->album->isMovieByIndex($i)) { - $label = _("Movie"); - } elseif ($gallery->album->isAlbum($i)) { - $label = _("Album"); - } else { - $label = _("Photo"); - } - - if (canVote()) { - print '
'; - } - echo("
\n"); - echo("\n\t\n"; - } - if (canVote()) { - print '
'; - } - echo("
"); - echo "\n"; - echo(""); - echo "\n"; - $j++; - $visibleItemIndex++; - $i = $visibleItemIndex<=$numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; - } - if ($printTableRow) { - echo(''); - } - - /* Now do the inline_albumthumb footer row */ - $visibleItemIndex = $rowStart; - $i = $visibleItemIndex <= $numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; - $j = 1; - if ($printTableRow) { - } - while ($j <= $cols && $i <= $numPhotos) { - $j++; - $visibleItemIndex++; - $i = $visibleItemIndex<=$numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; - } - if ($printTableRow) { - } - $rowCount++; - $rowStart = $visibleItemIndex; - } + // Find the correct starting point, accounting for hidden photos + $rowStart = 0; + $cnt = 0; + $form_pos=0; // counts number of images that have votes below, ie withou albums; + $rowStart = $start; + + while ($rowCount < $rows) { + /* Do the inline_albumthumb header row */ + $visibleItemIndex = $rowStart; + $i = $visibleItemIndex<=$numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; + $j = 1; + $printTableRow = false; + if ($j <= $cols && $i <= $numPhotos) { + $printTableRow = true; + } + while ($j <= $cols && $i <= $numPhotos) { + $j++; + $visibleItemIndex++; + $i = $visibleItemIndex <= $numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; + } + if ($printTableRow) { + } + + /* Do the picture row */ + $visibleItemIndex = $rowStart; + $i = $visibleItemIndex <= $numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; + $j = 1; + if ($printTableRow) { + echo(''); + } + while ($j <= $cols && $i <= $numPhotos) { + echo("\n"); + + //-- put some parameters for the wrap files in the global object --- + $gallery->html_wrap['borderColor'] = $bordercolor; + $borderwidth= $gallery->html_wrap['borderWidth'] = $borderwidth; + $gallery->html_wrap['pixelImage'] = getImagePath('pixel_trans.gif'); + + + + if ($gallery->album->isAlbum($i)) { + $scaleTo = 0; //$gallery->album->fields["thumb_size"]; + $myAlbum = $gallery->album->getNestedAlbum($i); + list($iWidth, $iHeight) = $myAlbum->getHighlightDimensions($scaleTo); + } else { + unset($myAlbum); + $scaleTo=0; // thumbs already the right + // size for this album + list($iWidth, $iHeight) = $gallery->album->getThumbDimensions($i, $scaleTo); + } + if ($iWidth == 0) { + $iWidth = $gallery->album->fields["thumb_size"]; + } + if ($iHeight == 0) { + $iHeight = 100; + } + + $gallery->html_wrap['imageWidth'] = $iWidth; + $gallery->html_wrap['imageHeight'] = $iHeight; + + $id = $gallery->album->getPhotoId($i); + if ($gallery->album->isMovieByIndex($i)) { + $gallery->html_wrap['imageTag'] = $gallery->album->getThumbnailTag($i); + $gallery->html_wrap['imageHref'] = makeAlbumUrl($gallery->session->albumName, $id); + $frame= $gallery->html_wrap['frame'] = $gallery->album->fields['thumb_frame']; + /*begin backwards compatibility */ + $gallery->html_wrap['thumbTag'] = $gallery->html_wrap['imageTag']; + $gallery->html_wrap['thumbHref'] = $gallery->html_wrap['imageHref']; + /*end backwards compatibility*/ + list($divCellWidth, $divCellHeight, $padding) = calcVAdivDimension($frame, $iHeight, $iWidth, $borderwidth); + // If there is only one column, we don't need to try and match row heights + if ($cols == 1) { + $padding = 0; + } + echo "
\n"; + + includeHtmlWrap('inline_moviethumb.frame'); + } elseif (isset($myAlbum)) { + // We already loaded this album - don't do it again, for performance reasons. + + $gallery->html_wrap['imageTag'] = $myAlbum->getHighlightTag($scaleTo,'',_("Highlight for Album:"). " ". gallery_htmlentities(removeTags($myAlbum->fields['title']))); + $gallery->html_wrap['imageHref'] = makeAlbumUrl($gallery->album->getAlbumName($i)); + $frame= $gallery->html_wrap['frame'] = $gallery->album->fields['album_frame']; + /*begin backwards compatibility */ + $gallery->html_wrap['thumbWidth'] = $gallery->html_wrap['imageWidth']; + $gallery->html_wrap['thumbHeight'] = $gallery->html_wrap['imageHeight']; + $gallery->html_wrap['thumbTag'] = $gallery->html_wrap['imageTag']; + $gallery->html_wrap['thumbHref'] = $gallery->html_wrap['imageHref']; + /*end backwards compatibility*/ + + list($divCellWidth,$divCellHeight, $padding) = calcVAdivDimension($frame, $iHeight, $iWidth, $borderwidth); + echo "
\n"; + includeHtmlWrap('inline_albumthumb.frame'); + } else { + $gallery->html_wrap['imageTag'] = $gallery->album->getThumbnailTag($i); + $gallery->html_wrap['imageHref'] = makeAlbumUrl($gallery->session->albumName, $id); + $frame= $gallery->html_wrap['frame'] = $gallery->album->fields['thumb_frame']; + /*begin backwards compatibility */ + $gallery->html_wrap['thumbTag'] = $gallery->html_wrap['imageTag']; + $gallery->html_wrap['thumbHref'] = $gallery->html_wrap['imageHref']; + /*end backwards compatibility*/ + + list($divCellWidth,$divCellHeight, $padding) = calcVAdivDimension($frame, $iHeight, $iWidth, $borderwidth); + echo "
\n"; + includeHtmlWrap('inline_photothumb.frame'); + } + + echo "\n"; + echo "
\n"; + + if (canVote()){ + if ($gallery->album->fields["poll_type"] == 'rank' && $divCellWidth < 200) { + $divCellWidth=200; + } + } + + echo "
\n"; + /* Do the clickable-dimensions row */ + if (!strcmp($gallery->album->fields['showDimensions'], 'yes')) { + echo ''; + $photo = $gallery->album->getPhoto($i); + $image = $photo->image; + if (!empty($image) && !$photo->isMovie()) { + $viewFull = $gallery->user->canViewFullImages($gallery->album); + $fullOnly = (isset($gallery->session->fullOnly) && + !strcmp($gallery->session->fullOnly, 'on') && + !strcmp($gallery->album->fields['use_fullOnly'], 'yes')); + list($wr, $hr) = $image->getDimensions(); + list($wf, $hf) = $image->getRawDimensions(); + /* display file sizes if dimensions are identical */ + if ($wr == $wf && $hr == $hf && $viewFull && $photo->isResized()) { + $fsr = ' ' . sprintf(_('%dkB'), (int) $photo->getFileSize(0) >> 10); + $fsf = ' ' . sprintf(_('%dkB'), (int) $photo->getFileSize(1) >> 10); + } else { + $fsr = ''; + $fsf = ''; + } + if (($photo->isResized() && !$fullOnly) || !$viewFull) { + echo '[${wr}x{$hr}${fsr}] "; + } + if ($viewFull) { + echo '[${wf}x${hf}${fsf}]"; + } + } else { + echo " "; + } + echo ''; + + } + + /* Now do the caption row */ + if ($gallery->album->isAlbum($i)) { + $myAlbum = new Album; + $myAlbum->load($gallery->album->getAlbumName($i)); + } + else { + $myAlbum = NULL; + } + + if ($gallery->album->isAlbum($i)) { + $iWidth = $gallery->album->fields['thumb_size']; + } else { + list($iWidth, $iHeight) = $gallery->album->getThumbDimensions($i); + } + + // put form outside caption to compress lines + if (!$gallery->session->offline && + (($gallery->user->canDeleteFromAlbum($gallery->album)) || + ($gallery->user->canWriteToAlbum($gallery->album)) || + ($gallery->user->canChangeTextOfAlbum($gallery->album)) || + (($gallery->album->getItemOwnerModify() || $gallery->album->getItemOwnerDelete()) && + ($gallery->album->isItemOwner($gallery->user->getUid(), $i) || + (isset($myAlbum) && $gallery->user->isOwnerOfAlbum($myAlbum)))))) + { + $showAdminForm = 1; + } else { + $showAdminForm = 0; + } + + // Caption itself + echo "\n
\n"; + $id = $gallery->album->getPhotoId($i); + if ($gallery->album->isHidden($i) && !$gallery->session->offline) { + echo "(" . _("hidden") .")
"; + } + $photo = $gallery->album->getPhoto($i); + if ($gallery->user->canWriteToAlbum($gallery->album) && + $photo->isHighlight() && !$gallery->session->offline) { + echo "(" . _("highlight") .")
"; + } + if (isset($myAlbum)) { + $myDescription = $myAlbum->fields['description']; + $buf = ""; + $buf = $buf."
". sprintf(_("Album: %s"), ''. $myAlbum->fields['title'] .''). '
'; + if ($myDescription != _("No description") && + $myDescription != "No description" && + $myDescription != "") { + $buf = $buf."
".$myDescription.""; + } + echo $buf; + + echo '
'; + echo _("Changed: ") ." ". $myAlbum->getLastModificationDate(); + echo "\n
"; + $visItems=array_sum($myAlbum->numVisibleItems($gallery->user)); + echo _("Contains: ") ." ". pluralize_n2(ngettext("1 item", "%d items", $visItems), $visItems) . '. '; + // If comments indication for either albums or both + switch ($gallery->app->comments_indication) { + + case "albums": + case "both": + $lastCommentDate = $myAlbum->lastCommentDate( + $gallery->app->comments_indication_verbose); + if ($lastCommentDate > 0) { + print lastCommentString($lastCommentDate, $displayCommentLegend); + } + } + echo '
'; + + if (!(strcmp($gallery->album->fields["display_clicks"] , "yes")) && !$gallery->session->offline && ($myAlbum->getClicks() > 0)) { + echo '
'; + echo _("Viewed:") . " ". pluralize_n2(ngettext("1 time", "%d times", $myAlbum->getClicks()), $myAlbum->getClicks()); + echo ".
"; + } + } + else { + echo "
\n"; + echo nl2br($gallery->album->getCaption($i)); + echo $gallery->album->getCaptionName($i) . ' '; + // indicate with * if we have a comment for a given photo + if ($gallery->user->canViewComments($gallery->album) + && $gallery->app->comments_enabled == 'yes') { + // If comments indication for either photos or both + switch ($gallery->app->comments_indication) { + case "photos": + case "both": + $lastCommentDate = $gallery->album->itemLastCommentDate($i); + print lastCommentString($lastCommentDate, $displayCommentLegend); + } + + } + echo "
\n"; + + if (!(strcmp($gallery->album->fields["display_clicks"] , "yes")) && !$gallery->session->offline && ($gallery->album->getItemClicks($i) > 0)) { + echo '
'; + echo _("Viewed:") ." ". pluralize_n2(ngettext("1 time", "%d times", $gallery->album->getItemClicks($i)), $gallery->album->getItemClicks($i)); + echo ".
\n"; + } + } + echo "
\n"; + // End Caption + + if (canVote()) { + echo("
\n"); + addPolling($gallery->album->getVotingIdByIndex($i), $form_pos, false); + $form_pos++; + } + + if ($showAdminForm) { + $albumItemOptions = getItemActions($i, false); + echo drawSelect2("s$i", $albumItemOptions, array( + 'onChange' => "imageEditChoice(document.vote_form.s$i)", + 'class' => 'adminform')); + } + if (canVote()) { + print '
'; + } + echo("
"); + echo "\n"; + echo(""); + echo "\n"; + $j++; + $visibleItemIndex++; + $i = $visibleItemIndex<=$numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; + } + if ($printTableRow) { + echo(''); + } + + /* Now do the inline_albumthumb footer row */ + $visibleItemIndex = $rowStart; + $i = $visibleItemIndex <= $numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; + $j = 1; + if ($printTableRow) { + } + while ($j <= $cols && $i <= $numPhotos) { + $j++; + $visibleItemIndex++; + $i = $visibleItemIndex<=$numVisibleItems ? $visibleItems[$visibleItemIndex] : $numPhotos+1; + } + if ($printTableRow) { + } + $rowCount++; + $rowStart = $visibleItemIndex; + } } else { ?> 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'); + $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'); } else { - echo _("This album is empty."); + echo _("This album is empty."); } ?> @@ -1071,7 +904,8 @@ - + *
@@ -1087,26 +921,26 @@ ?> user->isLoggedIn() && - $gallery->user->getEmail() && - !$gallery->session->offline && - $gallery->app->emailOn == "yes") { - if (getRequestVar('submitEmailMe')) { - if (getRequestVar('comments')) { - $gallery->album->setEmailMe('comments', $gallery->user); - } else { - $gallery->album->unsetEmailMe('comments', $gallery->user); - } - if (getRequestVar('other')) { - $gallery->album->setEmailMe('other', $gallery->user); - } else { - $gallery->album->unsetEmailMe('other', $gallery->user); - } - } - echo makeFormIntro("view_album.php", - array("name" => "email_me", "method" => "POST", "style" => "margin-bottom: 0px;")); - echo _("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" : ""; +$gallery->user->getEmail() && +!$gallery->session->offline && +$gallery->app->emailOn == "yes") { + if (getRequestVar('submitEmailMe')) { + if (getRequestVar('comments')) { + $gallery->album->setEmailMe('comments', $gallery->user); + } else { + $gallery->album->unsetEmailMe('comments', $gallery->user); + } + if (getRequestVar('other')) { + $gallery->album->setEmailMe('other', $gallery->user); + } else { + $gallery->album->unsetEmailMe('other', $gallery->user); + } + } + echo makeFormIntro("view_album.php", + array("name" => "email_me", "method" => "POST", "style" => "margin-bottom: 0px;")); + echo _("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" : ""; ?>
  • @@ -1121,18 +955,20 @@ 1) { + includeLayout('navigator.inc'); + includeLayout('navtablemiddle.inc'); + } + includeLayout('breadcrumb.inc'); + includeLayout('navtableend.inc'); } -includeLayout('navtableend.inc'); -includeLayout('ml_pulldown.inc'); +echo languageSelector(); includeHtmlWrap("album.footer"); -?> - +if (!$GALLERY_EMBEDDED_INSIDE) { ?> diff -Naur gallery-1.5-pl1/view_comments.php gallery-1.5.1/view_comments.php --- gallery-1.5-pl1/view_comments.php 2005-04-14 04:11:36.000000000 +0200 +++ gallery-1.5.1/view_comments.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,12 +15,12 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * * This page Created by Joseph D. Scheve ( chevy@tnatech.com ) for the * very pimp application that is Gallery. * - * $Id: view_comments.php,v 1.44.2.2 2005/04/14 02:11:36 cryptographite Exp $ + * $Id: view_comments.php,v 1.48.2.2 2005/09/12 22:40:44 dmolavi Exp $ */ ?> album->incrementClicks(); } - - $bordercolor = $gallery->album->fields["bordercolor"]; #-- breadcrumb text --- @@ -166,7 +164,7 @@ } } elseif (!$gallery->album->isHidden($i) || $gallery->user->isAdmin() || - $gallery->user->isOwnerOfAlbum($gallery->album) || $gallery->album->isItemOwner($i)) { + $gallery->user->isOwnerOfAlbum($gallery->album) || $gallery->album->isItemOwner($gallery->user, $i)) { $comments = $gallery->album->numComments($i); if($comments > 0) { includeLayout('commentboxtop.inc'); @@ -187,7 +185,7 @@ includeLayout('breadcrumb.inc'); includeLayout('navtableend.inc'); -includeLayout('ml_pulldown.inc'); +echo languageSelector(); $validation_file = 'view_comments.php'; $validation_args = array('set_albumName' => $gallery->session->albumName); includeHtmlWrap("general.footer"); diff -Naur gallery-1.5-pl1/view_photo.php gallery-1.5.1/view_photo.php --- gallery-1.5-pl1/view_photo.php 2005-04-14 03:48:28.000000000 +0200 +++ gallery-1.5.1/view_photo.php 2005-09-13 00:40:44.000000000 +0200 @@ -2,7 +2,7 @@ /* * Gallery - a web based photo album viewer and editor * Copyright (C) 2000-2005 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 @@ -12,15 +12,25 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: view_photo.php,v 1.237.2.7 2005/04/14 01:48:28 cryptographite Exp $ + * $Id: view_photo.php,v 1.260.2.3 2005/09/12 22:40:44 dmolavi Exp $ */ ?> session->albumName) || !$gallery->user->canReadAlbum($gallery->album) || !$gallery->album->isLoaded()) { - $gallery->session->gRedirDone = false; - header("Location: " . makeAlbumHeaderUrl('', '', array('gRedir' => 1))); - return; + $gallery->session->gRedirDone = false; + header("Location: " . makeAlbumHeaderUrl('', '', array('gRedir' => 1))); + return; } // Set $index from $id if (isset($id)) { - $index = $gallery->album->getPhotoIndex($id); - if ($index == -1) { - // That photo no longer exists. - header("Location: " . makeAlbumHeaderUrl($gallery->session->albumName)); - return; - } + $index = $gallery->album->getPhotoIndex($id); + if ($index == -1) { + // That photo no longer exists. + header("Location: " . makeAlbumHeaderUrl($gallery->session->albumName)); + return; + } } else { - $id = $gallery->album->getPhotoId($index); + if ($index > $gallery->album->numPhotos(1)) { + $index = $numPhotos; + } + $id = $gallery->album->getPhotoId($index); } +$nextId = getNextId($id); + // Determine if user has the rights to view full-sized images if (!empty($full) && !$gallery->user->canViewFullImages($gallery->album)) { - header("Location: " . makeAlbumHeaderUrl($gallery->session->albumName, $id)); - return; + header("Location: " . makeAlbumHeaderUrl($gallery->session->albumName, $id)); + return; } elseif (!$gallery->album->isResized($index) && !$gallery->user->canViewFullImages($gallery->album)) { - header("Location: " . makeAlbumHeaderUrl($gallery->session->albumName)); - return; + header("Location: " . makeAlbumHeaderUrl($gallery->session->albumName)); + return; } - -if (!isset($full)) { - $full=NULL; +if (!isset($full) || (isset($full) && !$gallery->album->isResized($index))) { + $full = NULL; } - if (!empty($votes)) { - if (!isset($votes[$id]) && - $gallery->album->getPollScale() == 1 && - $gallery->album->getPollType() == "critique") { - $votes[$id]=null; + if (!isset($votes[$id]) && + $gallery->album->getPollScale() == 1 && + $gallery->album->getPollType() == "critique") { + $votes[$id] = null; } - + saveResults($votes); if ($gallery->album->getPollShowResults()) { - list($buf, $rank)=showResultsGraph(0); - print $buf; + list($buf, $rank)=showResultsGraph(0); + print $buf; } } -// is photo hidden? should user see it anyway? -if (($gallery->album->isHidden($index)) - && (!$gallery->user->canWriteToAlbum($gallery->album))){ - header("Location: " . makeAlbumHeaderUrl($gallery->session->albumName)); - return; -} - $albumName = $gallery->session->albumName; -if (!isset($gallery->session->viewedItem[$gallery->session->albumName][$id]) - && !$gallery->session->offline) { - $gallery->session->viewedItem[$albumName][$id] = 1; - $gallery->album->incrementItemClicks($index); +if (!isset($gallery->session->viewedItem[$gallery->session->albumName][$id]) && + !$gallery->session->offline) { + $gallery->session->viewedItem[$albumName][$id] = 1; + $gallery->album->incrementItemClicks($index); } $photo = $gallery->album->getPhoto($index); + if ($photo->isMovie()) { - $image = $photo->thumbnail; + $image = $photo->thumbnail; } else { - $image = $photo->image; + $image = $photo->image; } $photoURL = $gallery->album->getAlbumDirURL("full") . "/" . $image->name . "." . $image->type; list($imageWidth, $imageHeight) = $image->getRawDimensions(); $do_fullOnly = isset($gallery->session->fullOnly) && - !strcmp($gallery->session->fullOnly,"on") && - !strcmp($gallery->album->fields["use_fullOnly"],"yes"); + !strcmp($gallery->session->fullOnly,"on") && + !strcmp($gallery->album->fields["use_fullOnly"],"yes"); if ($do_fullOnly) { - $full = $gallery->user->canViewFullImages($gallery->album); + $full = $gallery->user->canViewFullImages($gallery->album); } - -$fitToWindow = !strcmp($gallery->album->fields["fit_to_window"], "yes") - && !$gallery->album->isResized($index) - && !$full - && (!$GALLERY_EMBEDDED_INSIDE || $GALLERY_EMBEDDED_INSIDE =='phpBB2'); + +$fitToWindow = !strcmp($gallery->album->fields["fit_to_window"], "yes") + && !$gallery->album->isResized($index) + && !$full + && (!$GALLERY_EMBEDDED_INSIDE || $GALLERY_EMBEDDED_INSIDE =='phpBB2'); $numPhotos = $gallery->album->numPhotos($gallery->user->canWriteToAlbum($gallery->album)); + $next = $index+1; if ($next > $numPhotos) { - //$next = 1; - $last = 1; + //$next = 1; + $last = 1; } $prev = $index-1; if ($prev <= 0) { - //$prev = $numPhotos; - $first = 1; -} - -if ($index > $gallery->album->numPhotos(1)) { - $index = $numPhotos; + //$prev = $numPhotos; + $first = 1; } /* - * We might be prev/next navigating using this page - * so recalculate the 'page' variable - */ +* We might be prev/next navigating using this page +* so recalculate the 'page' variable +*/ $rows = $gallery->album->fields["rows"]; $cols = $gallery->album->fields["cols"]; $perPage = $rows * $cols; @@ -140,20 +144,16 @@ $gallery->session->albumPage[$gallery->album->fields['name']] = $page; /* - * Relative URLs are tricky if we don't know if we're rewriting - * URLs or not. If we're rewriting, then the browser will think - * we're down 1 dir farther than we really are. Use absolute - * urls wherever possible. - */ +* Relative URLs are tricky if we don't know if we're rewriting +* URLs or not. If we're rewriting, then the browser will think +* we're down 1 dir farther than we really are. Use absolute +* urls wherever possible. +*/ $top = $gallery->app->photoAlbumURL; $bordercolor = $gallery->album->fields["bordercolor"]; -$borderwidth = $gallery->album->fields["border"]; -if ($borderwidth == 0) { - $borderwidth = 1; -} -$mainWidth = "100%"; +$mainWidth = "100%"; $navigator["id"] = $id; $navigator["allIds"] = $gallery->album->getIds($gallery->user->canWriteToAlbum($gallery->album)); @@ -164,45 +164,51 @@ #-- breadcrumb text --- $upArrowURL = ''; + 'alt="' . _("navigate UP") .'" title="' . _("navigate UP") .'" border="0">'; if ($gallery->album->fields['returnto'] != 'no') { foreach ($gallery->album->getParentAlbums(true) as $navAlbum) { - $breadcrumb["text"][] = $navAlbum['prefixText'] .': '. - $navAlbum['title'] . " " . $upArrowURL . ""; + $breadcrumb["text"][] = $navAlbum['prefixText'] .': '. + $navAlbum['title'] . " " . $upArrowURL . ""; } } $extra_fields=$gallery->album->getExtraFields(false); -$title=NULL; +$title = NULL; if (in_array("Title", $extra_fields)) { - $title=$gallery->album->getExtraField($index, "Title"); + $title = $gallery->album->getExtraField($index, "Title"); } if (!$title) { - $title=$photo->image->name; + $title = $photo->image->name; } if (isset($gallery->app->comments_length)) { - $maxlength=$gallery->app->comments_length; + $maxlength = $gallery->app->comments_length; } else { - $maxlength=0; + $maxlength = 0; } if (!empty($save)) { - if ( empty($commenter_name) || empty($comment_text)) { - $error_text = _("Name and comment are both required to save a new comment!"); - } elseif ($maxlength >0 && strlen($comment_text) > $maxlength) { - $error_text = sprintf(_("Your comment is too long, the admin set maximum length to %d chars"), $maxlength); - } elseif (isBlacklistedComment($tmp = array('commenter_name' => $commenter_name, 'comment_text' => $comment_text), false)) { - $error_text = _("Your Comment contains forbidden words. It will not be added."); - } else { - $comment_text = removeTags($comment_text); - $commenter_name = removeTags($commenter_name); - $IPNumber = $_SERVER['REMOTE_ADDR']; - $gallery->album->addComment($id, stripslashes($comment_text), $IPNumber, $commenter_name); - $gallery->album->save(); - emailComments($id, $comment_text, $commenter_name); - } + if ( empty($commenter_name) || empty($comment_text)) { + $error_text = _("Name and comment are both required to save a new comment!"); + } elseif ($maxlength >0 && strlen($comment_text) > $maxlength) { + $error_text = sprintf(_("Your comment is too long, the admin set maximum length to %d chars"), $maxlength); + } elseif (isBlacklistedComment($tmp = array('commenter_name' => $commenter_name, 'comment_text' => $comment_text), false)) { + $error_text = _("Your Comment contains forbidden words. It will not be added."); + } else { + $comment_text = removeTags($comment_text); + $commenter_name = removeTags($commenter_name); + $IPNumber = $_SERVER['REMOTE_ADDR']; + $gallery->album->addComment($id, $comment_text, $IPNumber, $commenter_name); + $gallery->album->save(); + emailComments($id, $comment_text, $commenter_name); + } +} + +$metaTags = array(); +$keyWords = $gallery->album->getKeywords($index); +if (!empty($keyWords)) { + $metaTags['Keywords'] = ereg_replace("[[:space:]]+",' ',$keyWords); } if (!$GALLERY_EMBEDDED_INSIDE) { @@ -211,69 +217,67 @@ <?php echo $gallery->app->galleryTitle . ' :: '. $gallery->album->fields["title"] . ' :: '. $title ; ?> 0) { - if (!strcmp($navigator['allIds'][$navpage], $id)) { - break; - } - $navpage--; - } - if ($navigator['allIds'][0] != $id) { - if ($navigator['allIds'][0] != 'unknown') { ?> - - - - - - - - - -album->isRoot() && - (!$gallery->session->offline || isset($gallery->session->offlineAlbums["albums.php"]))) { ?> - -album->getKeywords($index); - if (!empty($keyWords)) { - $metakeywords = ereg_replace("[[:space:]]+",' ',$keyWords); - echo " \n"; - } + common_header(array('metaTags' => $metaTags)); + + /* prefetch/navigation */ + $navcount = sizeof($navigator['allIds']); + $navpage = $navcount - 1; + while ($navpage > 0) { + if (!strcmp($navigator['allIds'][$navpage], $id)) { + break; + } + $navpage--; + } + if ($navigator['allIds'][0] != $id) { + if ($navigator['allIds'][0] != 'unknown') { + echo "\n ". ''; + } + + if ($navigator['allIds'][$navpage-1] != 'unknown') { + echo "\n ". ''; + } + } + if ($navigator['allIds'][$navcount - 1] != $id) { + if ($navigator['allIds'][$navpage+1] != 'unknown') { + echo "\n ". ''; + } + if ($navigator['allIds'][$navcount-1] != 'unknown') { + echo "\n ". ''; + } + } + + echo "\n ". ''; + if ($gallery->album->isRoot() && + (!$gallery->session->offline || isset($gallery->session->offlineAlbums["albums.php"]))) { + echo "\n ". ''; + } ?> + > @@ -282,272 +286,290 @@ includeHtmlWrap("photo.header"); +$useIcons = (!$iconsForItemOptions || $gallery->app->useIcons == 'no') ? false : true; +$albumItemOptions = getItemActions($index, $useIcons); + if ($fitToWindow) { - /* Include Javascript */ - include(dirname(__FILE__) .'/js/fitToWindow.js.php'); + /* Include Javascript */ + include(dirname(__FILE__) .'/js/fitToWindow.js.php'); } ?> -
    - - - - - -
    +
    session->albumName, $id, array("full" => 0)); +$iconElements = array(); +$adminTextIconElemens = array(); if (!$gallery->album->isMovie($id)) { print "\n"; print ''."\n"; - if ($gallery->user->canWriteToAlbum($gallery->album)) { - $iconText = getIconText('window_fullscreen.gif', _("resize photo")); - $iconElements[] = popup_link($iconText, "resize_photo.php?index=$index", false, true, 500, 500); - } - - if ($gallery->user->canDeleteFromAlbum($gallery->album) || - ($gallery->album->getItemOwnerDelete() && $gallery->album->isItemOwner($gallery->user->getUid(), $index))) { - // determine index of next item (after deletion) - // we move to previous image if we're at the end - // and move forward if we're not - if ($index >= $numPhotos && $index > 1) { - $nextIndex = $index - 1; - } - elseif ($index + 1 <= $numPhotos) { - $nextIndex = $index + 1; - } - else { - $nextIndex = $index; - } - // make sure that the "next" item isn't an album - if ($gallery->album->isAlbum($nextIndex)) { - $nextId=''; - } else { - $nextId = $gallery->album->getPhotoId($nextIndex); - } - $iconText = getIconText('delete.gif', _("delete photo")); - $iconElements[] = popup_link($iconText, "delete_photo.php?id=$id&nextId=$nextId", false, true, 500, 500); - } - - if (!strcmp($gallery->album->fields["use_fullOnly"], "yes") && - !$gallery->session->offline && - $gallery->user->canViewFullImages($gallery->album)) { - - $lparams['set_fullOnly'] = (!isset($gallery->session->fullOnly) || strcmp($gallery->session->fullOnly,"on")) ? "on" : "off"; - $link = makeAlbumURL($gallery->session->albumName, $id, $lparams); - - $adminText = ' ' . _('View Images') .': [ '; - if (!isset($gallery->session->fullOnly) || strcmp($gallery->session->fullOnly,"on")) { - $adminText .= _('normal') . " | " . _('full') .' ]'; - } else { - $adminText .= "" . _("normal") .' | '. _('full') .' ]'; - } - } - if ($gallery->album->fields["use_exif"] == "yes" && - (eregi("jpe?g\$", $photo->image->type)) && - (isset($gallery->app->use_exif) || isset($gallery->app->exiftags))) { - - $albumName = $gallery->session->albumName; - $iconText = getIconText('frame_query.gif', _("photo properties")); - $iconElements[] = popup_link($iconText, "view_photo_properties.php?set_albumName=$albumName&index=$index", 0, false, 500, 500); - } - - if (isset($gallery->album->fields["print_photos"]) && - !$gallery->session->offline && - !$gallery->album->isMovie($id)){ - - $photo = $gallery->album->getPhoto($GLOBALS["index"]); - $photoPath = $gallery->album->getAlbumDirURL("full"); - $prependURL = ''; - if (!ereg('^https?://', $photoPath)) { - $prependURL = 'http'; - if (isset($_SERVER['HTTPS']) && stristr($_SERVER['HTTPS'], "on")) { - $prependURL .= 's'; - } - - $prependURL .= '://'. $_SERVER['HTTP_HOST']; - } - - $rawImage = $prependURL . $photoPath . "/" . $photo->image->name . "." . $photo->image->type; + (eregi("jpe?g\$", $photo->image->type)) && + (isset($gallery->app->use_exif) || isset($gallery->app->exiftags)) && + sizeof($albumItemOptions) == 2) { + $albumName = $gallery->session->albumName; + $iconText = getIconText('frame_query.gif', _("photo properties")); + $iconElements[] = popup_link($iconText, "view_photo_properties.php?set_albumName=$albumName&index=$index", 0, false, 500, 500); + } + + if (!empty($gallery->album->fields["print_photos"]) && + !$gallery->session->offline && + !$gallery->album->isMovie($id)){ + + $photo = $gallery->album->getPhoto($GLOBALS["index"]); + $photoPath = $gallery->album->getAlbumDirURL("full"); + $prependURL = ''; + if (!ereg('^https?://', $photoPath)) { + $prependURL = 'http'; + if (isset($_SERVER['HTTPS']) && stristr($_SERVER['HTTPS'], "on")) { + $prependURL .= 's'; + } - $thumbImage= $prependURL . $photoPath . "/"; - if ($photo->thumbnail) { - $thumbImage .= $photo->image->name . "." . "thumb" . "." . $photo->image->type; - } else if ($photo->image->resizedName) { - $thumbImage .= $photo->image->name . "." . "sized" . "." . $photo->image->type; - } else { - $thumbImage .= $photo->image->name . "." . $photo->image->type; - } + $prependURL .= '://'. $_SERVER['HTTP_HOST']; + } - list($imageWidth, $imageHeight) = $photo->image->getRawDimensions(); - - function enablePrintForm($name) { - global $printEZPrintsForm, $printPhotoAccessForm, $printShutterflyForm, $printFotoserveForm; - - switch ($name) { - case 'shutterfly': - $printShutterflyForm = true; - break; - - case 'fotoserve': - $printFotoserveForm = true; - break; - - case 'photoaccess': - $printPhotoAccessForm = true; - break; - - default: - break; - } - } + $rawImage = $prependURL . $photoPath . "/" . $photo->image->name . "." . $photo->image->type; - /* display photo printing services */ - $printServices = $gallery->album->fields['print_photos']; - $numServices = count($printServices); - - $fullNames = array( - 'Print Services' => array( - 'fotokasten' => 'Fotokasten', - 'fotoserve' => 'Fotoserve', - 'shutterfly' => 'Shutterfly', - 'photoaccess' => 'PhotoWorks', - ), - 'Mobile Service' => array('mpush' => 'mPUSH (mobile service)') - ); + $thumbImage= $prependURL . $photoPath . "/"; + if ($photo->thumbnail) { + $thumbImage .= $photo->image->name . "." . "thumb" . "." . $photo->image->type; + } else if ($photo->image->resizedName) { + $thumbImage .= $photo->image->name . "." . "sized" . "." . $photo->image->type; + } else { + $thumbImage .= $photo->image->name . "." . $photo->image->type; + } - /* display a '; - $selectCommand .= $instructionLine; + /* display photo printing services */ + $printServices = $gallery->album->fields['print_photos']; + $numServices = count($printServices); + + $fullNames = array( + 'Print Services' => array( + 'fotokasten' => 'Fotokasten', + 'fotoserve' => 'Fotoserve', + 'shutterfly' => 'Shutterfly', + 'photoaccess' => 'PhotoWorks', + ), + 'Mobile Service' => array('mpush' => 'mPUSH (mobile service)') + ); + + /* display a '; - $adminText .= $selectCommand; - - /* just print out text if only one option */ - } elseif ($numServices == 1 && isset($printServices[@key($printServices)]['checked'])) { - $name = @key($printServices); - - enablePrintForm($name); - foreach ($fullNames as $serviceGroupName => $serviceGroup) { - foreach ($serviceGroup as $name => $fullName) { - if (!isset($printServices[$name]['checked'])) { - continue; - } else { - $adminText .= "[" . - sprintf(_('process this photo with %s'), $fullName) . ']'; - } - } - } - - } ?> album->fields["use_fullOnly"], "yes") && + !$gallery->session->offline && + $gallery->user->canViewFullImages($gallery->album)) { + $lparams['set_fullOnly'] = (!isset($gallery->session->fullOnly) || strcmp($gallery->session->fullOnly,"on")) ? "on" : "off"; + $link = makeAlbumURL($gallery->session->albumName, $id, $lparams); + $adminTextIconElemens[] = _('View Images:'); + $iconTextNormal = _("normal"); + $iconTextFull = _("full"); + + if (!isset($gallery->session->fullOnly) || strcmp($gallery->session->fullOnly,"on")) { + $adminTextIconElemens[] = $iconTextNormal; + $adminTextIconElemens[] = '|'; + $adminTextIconElemens[] = "[" . $iconTextFull .']'; + } else { + $adminTextIconElemens[] = "[" .$iconTextNormal .']'; + $adminTextIconElemens[] = '|'; + $adminTextIconElemens[] = $iconTextFull; + } + } + + /* If eCards are enabled, show the link. + ** The eCard opens in a popup and sends the actual displayed photo. + */ + if(isset($gallery->album->fields["ecards"]) && $gallery->album->fields["ecards"] == 'yes' && + $gallery->app->emailOn == 'yes') { + $iconText = getIconText('ecard.gif', _("Send Photo as eCard")); + $adminTextIconElemens[] = popup_link($iconText, + makeGalleryUrl('ecard_form.php', array('photoIndex' => $index,'gallery_popup' => 'true' )), 1, true, 550, 600); + } +} + +if(sizeof($albumItemOptions) > 2 && !$useIcons) { + $iconElements[] = drawSelect2("itemOptions", $albumItemOptions, array( + 'onChange' => "imageEditChoice(document.admin_options_form.itemOptions)", + 'class' => 'adminform') + ); } if (!$GALLERY_EMBEDDED_INSIDE && !$gallery->session->offline) { - if ($gallery->user->isLoggedIn()) { - $iconText = getIconText('exit.gif', _("logout")); - $iconElements[] = ' $page)) . - '">'. $iconText .''; - } else { - $iconText = getIconText('identity.gif', _("login")); - $iconElements[] = popup_link($iconText, "login.php", false, true, 500, 500); - } + if ($gallery->user->isLoggedIn()) { + $iconText = getIconText('exit.gif', _("logout")); + $iconElements[] = ' $page)) . + '">'. $iconText .''; + } else { + $iconText = getIconText('identity.gif', _("login")); + $iconElements[] = popup_link($iconText, "login.php", false); + } } includeLayout('navtablebegin.inc'); -$adminbox["text"] = $adminText; -$adminbox["commands"] = makeIconMenu($iconElements);; +$adminbox["text"] = makeIconMenu($adminTextIconElemens, 'left'); +$adminbox["commands"] = makeIconMenu($iconElements, 'right'); $adminbox["bordercolor"] = $bordercolor; includeLayout('adminbox.inc'); includeLayout('navtablemiddle.inc'); $breadcrumb["bordercolor"] = $bordercolor; -$breadcrumb["top"] = true; -$breadcrumb['bottom'] = false; includeLayout('breadcrumb.inc'); + +/* Show itemOptions only if we have more then one (photo properties) */ +if(sizeof($albumItemOptions) > 2 && $useIcons) { + includeLayout('navtablemiddle.inc'); + $albumItemOptionElements = array(); + foreach ($albumItemOptions as $trash => $option) { + if(!empty($option['value'])) { + echo "\n". popup_link($option['text'], $option['value'], true, false, 500, 500, 'iconLink'); + } + } +} + includeLayout('navtablemiddle.inc'); -includeLayout('navphoto.inc'); + +if ($gallery->album->fields['nav_thumbs'] != 'no' && + $gallery->album->fields['nav_thumbs_location'] != 'bottom') { + includeLayout('navmicro.inc'); + includeLayout('navtablemiddle.inc'); +} + +if ( $gallery->album->fields['nav_thumbs'] != 'yes') { + includeLayout('navphoto.inc'); +} + includeLayout('navtableend.inc'); #-- if borders are off, just make them the bgcolor ---- if ($gallery->album->fields["border"] == 0) { - $bordercolor = $gallery->album->fields["bgcolor"]; + $bordercolor = $gallery->album->fields["bgcolor"]; } if ($bordercolor) { - $bordercolor = "bgcolor=$bordercolor"; + $bordercolor = "bgcolor=$bordercolor"; } ?> -
    -
    -
    + +
+ -
+
@@ -556,29 +578,32 @@ album->isMovie($id)) { - if (!$do_fullOnly && ($full || $fitToWindow || $gallery->album->isResized($index))) { - if ($fitToWindow) { - $href=""; - } - else if ($full) { - $href= makeAlbumUrl($gallery->session->albumName, $id); - } else if ($gallery->user->canViewFullImages($gallery->album)) { - $href= makeAlbumUrl($gallery->session->albumName, $id, array("full" => 1)); - } - } + if(!$do_fullOnly && ($full || $fitToWindow || $gallery->album->isResized($index))) { + switch(true) { + case $fitToWindow: + $href=""; + break; + case $full: + $href = makeAlbumUrl($gallery->session->albumName, $id); + break; + case $gallery->user->canViewFullImages($gallery->album): + $href = makeAlbumUrl($gallery->session->albumName, $id, array("full" => 1)); + break; + } + } } else { - $href= $gallery->album->getPhotoPath($index) ; + $href = $gallery->album->getPhotoPath($index) ; } -$photoTag=""; -$frame= $gallery->album->fields['image_frame']; +$frame = $gallery->album->fields['image_frame']; if ($fitToWindow && (eregi('safari|opera', $_SERVER['HTTP_USER_AGENT']) || $gallery->session->offline)) { - //Safari/Opera can't render dynamically sized image frame - $frame = 'none'; + //Safari/Opera can't render dynamically sized image frame + $frame = 'none'; } -$photoTag .= $gallery->album->getPhotoTag($index, $full); + +$photoTag = $gallery->album->getPhotoTag($index, $full,'id="galleryImage"'); list($width, $height) = $photo->getDimensions($full); $gallery->html_wrap['borderColor'] = $gallery->album->fields["bordercolor"]; @@ -589,7 +614,7 @@ $gallery->html_wrap['imageHref'] = $href; $gallery->html_wrap['imageTag'] = $photoTag; if ($fitToWindow && $gallery->user->canViewFullImages($gallery->album)) { - $gallery->html_wrap['attr'] = 'onclick="sizeChange.toggle()"'; + $gallery->html_wrap['attr'] = 'onclick="sizeChange.toggle()"'; } $gallery->html_wrap['pixelImage'] = getImagePath('pixel_trans.gif'); @@ -597,13 +622,12 @@ ?>
-

album, $index) ?> +

album, $index) ?>

-

\n"; - echo makeFormIntro("view_photo.php", array("name" => "vote_form", - "method" => "POST")); + echo "\n\n"; + echo makeFormIntro("view_photo.php", array("name" => "vote_form", + "method" => "POST")); ?> '; - echo addPolling("item.$id"); + echo ''; + echo addPolling("item.$id"); ?> album->getPollShowResults()) { - echo "\n"; - echo "\n". '

'; - echo showResults("item.$id"); - echo "\n

"; + echo "\n"; + echo "\n". '

'; + echo showResults("item.$id"); + echo "\n

"; } echo "\n"; if (isset($error_text)) { - echo gallery_error($error_text) ."

"; + echo gallery_error($error_text) ."

"; } if ($gallery->user->canViewComments($gallery->album) && $gallery->app->comments_enabled == 'yes') { - echo viewComments($index, $gallery->user->canAddComments($gallery->album), $page_url); + echo viewComments($index, $gallery->user->canAddComments($gallery->album), $page_url); } echo "
"; includeHtmlWrap("inline_photo.footer"); -?> -user->isLoggedIn() && - $gallery->user->getEmail() && - !$gallery->session->offline && - $gallery->app->emailOn == "yes") { - $emailMeComments = getRequestVar('emailMeComments'); - if (!empty($emailMeComments)) { - if ($emailMeComments == 'true') { - $gallery->album->setEmailMe('comments', $gallery->user, $id); - } else { - $gallery->album->unsetEmailMe('comments', $gallery->user, $id); - } - } +if ($gallery->user->isLoggedIn() && + $gallery->user->getEmail() && + !$gallery->session->offline && + $gallery->app->emailOn == "yes") { + $emailMeComments = getRequestVar('emailMeComments'); + if (!empty($emailMeComments)) { + if ($emailMeComments == 'true') { + $gallery->album->setEmailMe('comments', $gallery->user, $id); + } else { + $gallery->album->unsetEmailMe('comments', $gallery->user, $id); + } + } - if (! $gallery->album->getEmailMe('comments', $gallery->user)) { - echo "\n
"; + if (! $gallery->album->getEmailMe('comments', $gallery->user)) { + echo "\n"; - $url= makeAlbumUrl($gallery->session->albumName, $id, array( - 'emailMeComments' => ($gallery->album->getEmailMe('comments', $gallery->user, $id)) ? 'false' : 'true') - ); + $url= makeAlbumUrl($gallery->session->albumName, $id, array( + 'emailMeComments' => ($gallery->album->getEmailMe('comments', $gallery->user, $id)) ? 'false' : 'true') + ); - echo _("Email me when comments are added"); + echo _("Email me when comments are added"); ?> album->getEmailMe('comments', $gallery->user, $id)) ? "checked" : "" ?> onclick="location.href=''" >
"; includeLayout('navtablebegin.inc'); -includeLayout('navphoto.inc'); -$breadcrumb["top"] = false; -includeLayout('navtablemiddle.inc'); + +if ($gallery->album->fields['nav_thumbs'] != 'no' && + $gallery->album->fields['nav_thumbs_location'] != 'top') { + includeLayout('navmicro.inc'); + includeLayout('navtablemiddle.inc'); +} + +if ( $gallery->album->fields['nav_thumbs'] != 'yes') { + includeLayout('navphoto.inc'); + includeLayout('navtablemiddle.inc'); +} + includeLayout('breadcrumb.inc'); includeLayout('navtableend.inc'); -includeLayout('ml_pulldown.inc'); +echo languageSelector(); if ($fitToWindow) { ?> "> album->getCaption($index); - if (empty($imbkprnt)) { - $imbkprnt = makeAlbumUrl($gallery->session->albumName, $id); - } + /* Print the caption on back of photo. If no caption, + * then print the URL to this page. Shutterfly cuts + * the message off at 80 characters. */ + $imbkprnt = $gallery->album->getCaption($index); + if (empty($imbkprnt)) { + $imbkprnt = makeAlbumUrl($gallery->session->albumName, $id); + } ?> @@ -745,7 +777,7 @@ diff -Naur gallery-1.5-pl1/view_photo_properties.php gallery-1.5.1/view_photo_properties.php --- gallery-1.5-pl1/view_photo_properties.php 2005-03-10 03:29:40.000000000 +0100 +++ gallery-1.5.1/view_photo_properties.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,16 +15,16 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: view_photo_properties.php,v 1.43.2.1 2005/03/10 02:29:40 cryptographite Exp $ + * $Id: view_photo_properties.php,v 1.46.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> user->canReadAlbum($gallery->album)) { @@ -34,7 +34,6 @@ doctype(); ?> - <?php echo _("Photo Properties") ?> @@ -104,7 +103,8 @@ } } - $extra_fields=$gallery->album->getExtraFields(false); + $extra_fields = $gallery->album->getExtraFields(false); + displayPhotoFields($index, $extra_fields, false, true,NULL,$forceRefresh); if ($gallery->album->getKeyWords($index)) { diff -Naur gallery-1.5-pl1/watermark_album.php gallery-1.5.1/watermark_album.php --- gallery-1.5-pl1/watermark_album.php 2005-03-10 03:29:40.000000000 +0100 +++ gallery-1.5.1/watermark_album.php 2005-09-13 00:40:44.000000000 +0200 @@ -15,34 +15,45 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id: watermark_album.php,v 1.19.2.1 2005/03/10 02:29:40 cryptographite Exp $ + * $Id: watermark_album.php,v 1.21.2.1 2005/09/12 22:40:44 dmolavi Exp $ */ ?> user->canChangeTextOfAlbum($gallery->album)) { - echo _("You are not allowed to perform this action!"); - exit; + echo _("You are not allowed to perform this action!"); + exit; } if (empty($index)) { - $index=''; + $index = ''; } $highlightIndex = $gallery->album->getHighlight(); +$err = ''; -$err = ""; if (isset($save) || isset($preview)) { - if (isset($wmAlign) && ($wmAlign > 0) && ($wmAlign < 12)) { - if (isset($wmName) && !empty($wmName)) { - if (isset($save)) { + if (isset($wmAlign) && ($wmAlign > 0) && ($wmAlign < 12)) { + if (isset($wmName) && !empty($wmName)) { + if (isset($save)) { ?> @@ -51,42 +62,50 @@
-
-( ) +
+
app->timeLimit); - $gallery->album->watermarkAlbum($wmName, "", - $wmAlign, $wmAlignX, $wmAlignY, $recursive, $wmSelect); - $gallery->album->save(); + my_flush(); + set_time_limit($gallery->app->timeLimit); + $gallery->album->watermarkAlbum( + $wmName, + "", + $wmAlign, + $wmAlignX, + $wmAlignY, + $recursive, + $wmSelect + ); + $gallery->album->save(); ?>
-
album->watermarkPhoto($highlightIndex, $wmName, "", $wmAlign, - isset($wmAlignX) ? $wmAlignX : 0, - isset($wmAlignY) ? $wmAlignY : 0, - 1, // set as preview - isset($previewFull) ? $previewFull : 0); - - } - } else { - $err = _("Please select a watermark."); - } - } else { - $err = _("Please select an alignment."); - } + dismissAndReload(); + return; + } else { + // create a preview of the highlight image + $gallery->album->watermarkPhoto( + $highlightIndex, + $wmName, + "", + $wmAlign, + isset($wmAlignX) ? $wmAlignX : 0, + isset($wmAlignY) ? $wmAlignY : 0, + 1, // set as preview + isset($previewFull) ? $previewFull : 0); + } + } else { + $err = _("Please select a watermark."); + } + } else { + $err = _("Please select an alignment."); + } } else { - if (!isset($recursive)) { - $recursive = 1; - } - + if (!isset($recursive)) { + $recursive = 1; + } } doctype(); ?> @@ -100,28 +119,28 @@
album->numPhotos(1)) { - echo "\n

". gallery_error(_("No items to watermark.")) . "

"; + echo "\n

". gallery_error(_("No items to watermark.")) . "

"; } else { - $highlightIndex = $gallery->album->getHighlight(); - if (isset($highlightIndex)) { - if (isset($preview)) { - echo $gallery->album->getPreviewTag($highlightIndex); - } else { - echo $gallery->album->getThumbnailTag($highlightIndex); - } - } - - if (!empty($err)) { - echo "\n

". gallery_error($err) . "

"; - } - echo makeFormIntro("watermark_album.php", - array("name" => "theform", - "method" => "POST")); - global $watermarkForm; - $watermarkForm["askRecursive"] = 1; - $watermarkForm["askPreview"] = 1; - $watermarkForm["allowNone"] = 0; - includeLayout ('watermarkform.inc'); + $highlightIndex = $gallery->album->getHighlight(); + if (isset($highlightIndex)) { + if (isset($preview)) { + echo $gallery->album->getPreviewTag($highlightIndex); + } else { + echo $gallery->album->getThumbnailTag($highlightIndex); + } + } + + if (!empty($err)) { + echo "\n

". gallery_error($err) . "

"; + } + + echo infoLine(_("Keep in mind that watermarking on animated gifs is currently not supported and will 'deface & unanimate' your pictures."), 'notice'); + echo makeFormIntro("watermark_album.php", array("name" => "theform", "method" => "POST")); + global $watermarkForm; + $watermarkForm["askRecursive"] = 1; + $watermarkForm["askPreview"] = 1; + $watermarkForm["allowNone"] = 0; + includeLayout ('watermarkform.inc'); ?>

@@ -136,13 +155,17 @@ - - +

+ $gallery->album->fields["name"])); +?>