diff -Naur gallery-1.5.1/add_comment.php gallery-1.5.2/add_comment.php --- gallery-1.5.1/add_comment.php 2005-09-13 00:40:44.000000000 +0200 +++ gallery-1.5.2/add_comment.php 2006-01-06 07:31:30.000000000 +0100 @@ -1,7 +1,7 @@ user->canAddComments($gallery->album)) { - echo _("You are not allowed to perform this action!"); + echo gTranslate('core', "You are not allowed to perform this action!"); exit; } @@ -35,8 +35,7 @@ $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 = $gallery->user->printableName($gallery->app->comments_display_name); } } elseif (!isset($commenter_name)) { $commenter_name = ''; @@ -54,14 +53,14 @@ if (isset($save)) { if ( empty($commenter_name) || empty($comment_text)) { - $error_text = _("Name and comment are both required to save a new comment!"); + $error_text = gTranslate('core', "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); + $error_text = sprintf(gTranslate('core', "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."); + $error_text = gTranslate('core', "Your Comment contains forbidden words. It will not be added."); } else { - $comment_text = removeTags($comment_text); - $commenter_name = removeTags($commenter_name); + $comment_text = strip_tags($comment_text); + $commenter_name = strip_tags($commenter_name); $IPNumber = $_SERVER['REMOTE_ADDR']; $gallery->album->addComment($id, $comment_text, $IPNumber, $commenter_name); @@ -77,13 +76,13 @@ ?> - <?php echo _("Add Comment") ?> + <?php echo gTranslate('core', "Add Comment") ?> -
+
-

+

album->getThumbnailTagById($id); @@ -91,21 +90,19 @@ echo "\n
". gallery_error($error_text); } echo "

"; -echo makeFormIntro("add_comment.php", - array("name" => "theform", "method" => "POST"), - array('type' => 'popup')); +echo makeFormIntro("add_comment.php", array(), array('type' => 'popup')); drawCommentAddForm($commenter_name, 35); ?> -
" onclick='parent.close()'> +
" onclick='parent.close()'>
diff -Naur gallery-1.5.1/add_photos_frame.php gallery-1.5.2/add_photos_frame.php --- gallery-1.5.1/add_photos_frame.php 2005-09-13 00:40:44.000000000 +0200 +++ gallery-1.5.2/add_photos_frame.php 2006-01-06 07:31:30.000000000 +0100 @@ -1,7 +1,7 @@ user->isAdmin()) { - $modes["admin"] = _("Admin"); -} - if (!isset($mode) || !isset($modes[$mode])) { $mode = isset($modes[$gallery->app->uploadMode]) ? $gallery->app->uploadMode : "form"; } @@ -101,11 +94,9 @@ echo "\t\t
  • $mt
    • \n"; } } -?> - - +echo "\n\t"; + +include (dirname(__FILE__) . "/includes/add_photos/add_$mode.inc");?> diff -Naur gallery-1.5.1/administer_startpage.php gallery-1.5.2/administer_startpage.php --- gallery-1.5.1/administer_startpage.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/administer_startpage.php 2006-01-06 07:31:30.000000000 +0100 @@ -0,0 +1,115 @@ + +version)) { + require_once(dirname(__FILE__) . '/init.php'); +} + +if (!$gallery->user->isAdmin()) { + echo _("You are not allowed to perform this action!"); + exit; +} + +list($sort, $order, $fieldname) = getRequestVar(array('sort', 'order', 'fieldname')); + +$adminOptions[] = array( + 'text' => _("Rebuild highlights"), + 'url' => doCommand('rebuild_highlights'), + 'longtext' => _("Recreate all highlights according to the setting in configwizard.
    (Starts immediately)") +); + +$adminOptions[] = array( + 'text' => _("Albumorder"), + 'url' => makeGalleryUrl('administer_startpage.php', array('sort' => 1, 'type' => 'popup')), + 'longtext' => _("Sort the albums on the startpage(s).
    (Opens an option dialog)") +); + +array_sort_by_fields($adminOptions, 'text', 'asc'); + +$sortOptions = array( + 'name' => _("By (physical) name"), + 'clicks_date' => _("By last reset date"), + 'creation_date' => _("By creation date (works only with albums created with 1.5.2-cvs-b28 or newer)") +); + +doctype(); +printPopupStart(_("Administer Startpage")); + +if(empty($sort)) { + echo "\n"; + foreach ($adminOptions as $option) { + echo "\n"; + if (isset($option['url'])) { + $link = ''. $option['text'] .''; + } else { + $link = popup_link($option['text'], $option['popupFile'], false, true, 500, 500, 'admin'); + } + echo "\n"; + echo "\n"; + echo "\n"; + } + echo "\n
    $link". $option['longtext'] ."
    "; +} +elseif (empty($order)) { + echo makeFormIntro('administer_startpage.php'); +?> + + + $text) { + echo "\n "; + echo "\n "; + echo "\n "; + echo "\n "; + } +?> +
    $text
    +

    + + +

    + + +"> +" onclick='parent.close()'> + +sortByField($fieldname, $order); + dismissAndReload(); +?> + " onclick='parent.close()'> + + + + diff -Naur gallery-1.5.1/admin-page.php gallery-1.5.2/admin-page.php --- gallery-1.5.1/admin-page.php 2005-09-13 00:40:44.000000000 +0200 +++ gallery-1.5.2/admin-page.php 2006-01-06 07:31:30.000000000 +0100 @@ -1,7 +1,7 @@ diff -Naur gallery-1.5.1/album_permissions.php gallery-1.5.2/album_permissions.php --- gallery-1.5.1/album_permissions.php 2005-09-13 00:40:44.000000000 +0200 +++ gallery-1.5.2/album_permissions.php 2006-01-06 07:31:30.000000000 +0100 @@ -1,7 +1,7 @@ user->isAdmin() && @@ -43,92 +33,59 @@ echo _("You are not allowed to perform this action!"); exit; } -?> -")) { - $gallery->album->setRead($allUid, 1); - $changed++; -} else if (isset($readUid) && isset($submit_read) && strchr($submit_read, "<")) { - $gallery->album->setRead($readUid, 0); - $changed++; -} - -if (isset($allUid) && isset($submit_text) && strchr($submit_text, ">")) { - $gallery->album->setChangeText($allUid, 1); - $changed++; -} else if (isset($textUid) && isset($submit_text) && strchr($submit_text, "<")) { - $gallery->album->setChangeText($textUid, 0); - $changed++; -} - -if (isset($allUid) && isset($submit_add) && strchr($submit_add, ">")) { - $gallery->album->setAddTo($allUid, 1); - $changed++; -} else if (isset($addUid) && isset($submit_add) && strchr($submit_add, "<")) { - $gallery->album->setAddTo($addUid, 0); - $changed++; -} - -if (isset($allUid) && isset($submit_write) && strchr($submit_write, ">")) { - $gallery->album->setWrite($allUid, 1); - $changed++; -} else if (isset($writeUid) && isset($submit_write) && strchr($submit_write, "<")) { - $gallery->album->setWrite($writeUid, 0); - $changed++; -} - -if (isset($allUid) && isset($submit_delete) && strchr($submit_delete, ">")) { - $gallery->album->setDeleteFrom($allUid, 1); - $changed++; -} else if (isset($deleteUid) && isset($submit_delete) && strchr($submit_delete, "<")) { - $gallery->album->setDeleteFrom($deleteUid, 0); - $changed++; -} -if (isset($allUid) && isset($submit_createSub) && strchr($submit_createSub, ">")) { - $gallery->album->setCreateSubAlbum($allUid, 1); - $changed++; -} else if (isset($createSubUid) && isset($submit_createSub) && strchr($submit_createSub, "<")) { - $gallery->album->setCreateSubAlbum($createSubUid, 0); - $changed++; -} +$perms = array( + 'canRead' => _("Users who can see the album."), + 'canAddTo' => _("Users who can add photos."), + 'canDeleteFrom' => _("Users who can delete photos."), + 'canWrite' => _("Users who can modify photos."), + 'canCreateSubAlbum' => _("Users who can create sub albums."), + 'zipDownload' => _("Users who can to download album (with subalbums) as archive."), + 'canViewComments' => _("Users who can view comments."), + 'canAddComments' => _("Users who can add comments."), + 'canViewFullImages' => _("Users who can view full (original) images."), + 'canChangeText' => _("Users who can change album text."), +); -if (isset($allUid) && isset($submit_viewFullImages) && strchr($submit_viewFullImages, ">")) { - $gallery->album->setViewFullImages($allUid, 1); - $changed++; -} else if (isset($viewFullImagesUid) && isset($submit_viewFullImages) && strchr($submit_viewFullImages, "<")) { - $gallery->album->setViewFullImages($viewFullImagesUid, 0); - $changed++; +foreach ($gallery->userDB->getUidList() as $uid) { + $tmpUser = $gallery->userDB->getUserByUid($uid); + $uname = $tmpUser->getUsername(); + if ($tmpUser->isPseudo()) { + $uname = "*$uname*"; + } + $uAll[$uid] = $uname; } -if (isset($allUid) && isset($submit_addComments) && strchr($submit_addComments, ">")) { - $gallery->album->setAddComments($allUid, 1); - $changed++; -} else if (isset($addCommentsUid) && isset($submit_addComments) && strchr($submit_addComments, "<")) { - $gallery->album->setAddComments($addCommentsUid, 0); - $changed++; -} +asort($uAll); -if (isset($allUid) && isset($submit_viewComments) && strchr($submit_viewComments, ">")) { - $gallery->album->setViewComments($allUid, 1); - $changed++; -} else if (isset($viewCommentsUid) && isset($submit_viewComments) && strchr($submit_viewComments, "<")) { - $gallery->album->setViewComments($viewCommentsUid, 0); - $changed++; +$changed = 0; +if(empty($submit)) { + $submit = array(); +} + +foreach ($submit as $perm => $action) { + if(isset($action) && isset($actionUid)) { + if($action == '-->') { + $gallery->album->setPerm($perm, $actionUid, true); + $changed++; + } + if($action == '<--') { + $gallery->album->setPerm($perm, $actionUid, false); + $changed++; + } + } } if (isset($save) && $ownerUid) { - $gallery->album->setOwner($ownerUid); - $changed++; + $gallery->album->setOwner($ownerUid); + $changed++; } if ($changed) { - $gallery->album->save(array(i18n("Permissions have been changed"))); - - if (getRequestVar('setNested')) { - $gallery->album->setNestedPermissions(); - } + $gallery->album->save(array(i18n("Permissions have been changed"))); + if (getRequestVar('setNested')) { + $gallery->album->setNestedPermissions(); + } } // Start with a default owner of nobody -- if there is an @@ -136,48 +93,18 @@ $nobody = $gallery->userDB->getNobody(); $ownerUid = $nobody->getUid(); -$uRead = $gallery->album->getPermUids("canRead"); -$uText = $gallery->album->getPermUids("canChangeText"); -$uAdd = $gallery->album->getPermUids("canAddTo"); -$uWrite = $gallery->album->getPermUids("canWrite"); -$uDelete = $gallery->album->getPermUids("canDeleteFrom"); -$uCreateSub = $gallery->album->getPermUids("canCreateSubAlbum"); -$uViewFullImages = $gallery->album->getPermUids("canViewFullImages"); -$uAddComments = $gallery->album->getPermUids("canAddComments"); -$uViewComments = $gallery->album->getPermUids("canViewComments"); - -foreach ($gallery->userDB->getUidList() as $uid) { - $tmpUser = $gallery->userDB->getUserByUid($uid); - $uname = $tmpUser->getUsername(); - $uAll[$uid] = $uname; -} - $owner = $gallery->album->getOwner(); $ownerUid = $owner->getUid(); -asort($uRead); -asort($uText); -asort($uWrite); -asort($uDelete); -asort($uCreateSub); -asort($uViewFullImages); -asort($uAddComments); -asort($uViewComments); -asort($uAdd); -asort($uAll); - -correctPseudoUsers($uRead, $ownerUid); -correctPseudoUsers($uText, $ownerUid); -correctPseudoUsers($uWrite, $ownerUid); -correctPseudoUsers($uDelete, $ownerUid); -correctPseudoUsers($uCreateSub, $ownerUid); -correctPseudoUsers($uViewFullImages, $ownerUid); -correctPseudoUsers($uAddComments, $ownerUid); -correctPseudoUsers($uViewComments, $ownerUid); -correctPseudoUsers($uAdd, $ownerUid); +// Set values for selectboxes +foreach($perms as $perm => $trash) { + $uids[$perm] = $gallery->album->getPermUids($perm); + asort($uids[$perm]); + correctPseudoUsers($uids[$perm], $ownerUid); +} +doctype(); ?> - <?php echo _("Album Permissions") ?> @@ -188,162 +115,40 @@
    '.$gallery->album->fields["title"] . ''); -echo makeFormIntro("album_permissions.php", - array("name" => "albumperms_form"), - array("type" => "popup")); -?> +echo makeFormIntro("album_permissions.php", array("name" => + "albumperms_form"), array("type" => "popup")); -user->isAdmin) { ?> - - +if ($gallery->user->isAdmin) { + echo _("Owner:") . drawSelect("ownerUid", $uAll, $ownerUid, 1, array(), true); +} +?> - + - \n"; +echo "\n"; + +echo "\n"; +echo "\n + + + + +
    - +     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    - -
    - -
    -     		- -
    - -
    - -
    -     		- -
    - -
    - -
    -     		- -
    - -
    - -
    -     		- -
    - -
    - -
    -     		- -
    - -
    - -
    -     		- -
    - -
    - -
    -     		- - -
    - -
    - -
    -     		- -
    - -
    - -
    -     		- -
    + +$permsTable = new galleryTable(); +$permsTable->setColumnCount(2); +foreach($perms as $perm => $permDesc) { + $permsTable->addElement(array('content' => $permDesc, 'cellArgs' => array('colspan' => 2))); + $permsTable->addElement( + array('content' => + "\n\t\">
    ". + "\n\t" + )); + $permsTable->addElement( + array('content' => drawSelect("actionUid", $uids[$perm], '', 3, array(), true)) + ); +} +echo $permsTable->render(); +?>
    diff -Naur gallery-1.5.1/albums.php gallery-1.5.2/albums.php --- gallery-1.5.1/albums.php 2005-09-13 00:40:44.000000000 +0200 +++ gallery-1.5.2/albums.php 2006-01-08 21:07:15.000000000 +0100 @@ -1,7 +1,7 @@ ", - $cache_file_basename, strftime("%D %T", $cache_stat[9])); - return; - } - } - } - } + $cache_now = time(); + $cacheFileBaseNames = array(sprintf("cache-%s.html", $_SERVER['HTTP_HOST']), "cache.html"); + foreach ($cacheFileBaseNames as $cache_file_basename) { + $cache_file = dirname(__FILE__) . '/' . $cache_file_basename; + if (fs_file_exists($cache_file)) { + $cache_stat = @stat($cache_file); + if ($cache_now - $cache_stat[9] < (20 * 60)) { + if ($fp = fopen($cache_file, "rb")) { + while (!feof($fp)) { + print fread($fp, 4096); + } + fclose($fp); + printf("", + $cache_file_basename, strftime("%D %T", $cache_stat[9])); + return; + } + } + } + } } } @@ -55,6 +55,7 @@ /* Read the album list */ $albumDB = new AlbumDB(FALSE); + $gallery->session->albumName = ''; $page = 1; @@ -107,7 +108,7 @@ } if ($gallery->app->rssEnabled == "yes" && !$gallery->session->offline) { ?> - app->galleryTitle) ?>" href="app->photoAlbumURL . "/rss.php" ?>" type="application/rss+xml"> + app->galleryTitle) ?>" href="app->photoAlbumURL . "/rss.php" ?>" type="application/rss+xml"> @@ -118,7 +119,8 @@ includeHtmlWrap("gallery.header"); if (!$gallery->session->offline && - ( ($gallery->app->showSearchEngine == 'yes' && $numPhotos != 0 ) || $GALLERY_EMBEDDED_INSIDE == 'phpBB2')) { + ( ($gallery->app->showSearchEngine == 'yes' && $numPhotos != 0) || + $GALLERY_EMBEDDED_INSIDE == 'phpBB2')) { ?> @@ -141,24 +143,24 @@ /* Admin Text (left side) */ $adminText = ''; if ($numAccess == $numAlbums) { - $toplevel_str= pluralize_n2(ngettext("1 album","%d albums",$numAlbums), $numAlbums, _("no albums")); + $toplevel_str = gTranslate('core', "1 album","%d albums", $numAlbums, gTranslate('core', "no albums")); } else { - $toplevel_str= pluralize_n2(ngettext("1 top-level album","%d top-level albums",$numAlbums), $numAlbums, _("No top-level albums")); + $toplevel_str = gTranslate('core', "1 top-level album","%d top-level albums", $numAlbums, gTranslate('core', "No top-level albums")); } -$total_str= sprintf(_("%d total"), $numAccess); -$image_str= pluralize_n2(ngettext("1 image", "%d images", $numPhotos), $numPhotos, _("no images")); -$page_str= pluralize_n2(ngettext("1 page", "%d pages", $maxPages), $maxPages, _("no pages")); +$total_str = sprintf(gTranslate('core', "%d total"), $numAccess); +$image_str = gTranslate('core', "1 image", "%d images", $numPhotos, gTranslate('core', "no images")); +$page_str = gTranslate('core', "1 page", "%d pages", $maxPages, gTranslate('core', "no pages")); if (($numAccess != $numAlbums) && $maxPages > 1) { - $adminText .= sprintf(_("%s (%s), %s on %s"), $toplevel_str, $total_str, $image_str, $page_str); + $adminText .= sprintf(gTranslate('core', "%s (%s), %s on %s"), $toplevel_str, $total_str, $image_str, $page_str); } else if ($numAccess != $numAlbums) { - $adminText .= sprintf(_("%s (%s), %s"), $toplevel_str, $total_str, $image_str); + $adminText .= sprintf(gTranslate('core', "%s (%s), %s"), $toplevel_str, $total_str, $image_str); } else if ($maxPages > 1) { - $adminText .= sprintf(_("%s, %s on %s"), $toplevel_str, $image_str, $page_str); + $adminText .= sprintf(gTranslate('core', "%s, %s on %s"), $toplevel_str, $image_str, $page_str); } else { - $adminText .= sprintf(_("%s, %s"), $toplevel_str, $image_str); + $adminText .= sprintf(gTranslate('core', "%s, %s"), $toplevel_str, $image_str); } if (!empty($gallery->app->stats_foruser) && $numPhotos != 0) { @@ -173,49 +175,55 @@ if ($gallery->user->isLoggedIn() && !$gallery->session->offline) { $displayName = $gallery->user->displayName(); - $adminCommands .= sprintf(_("Welcome, %s"), $displayName) . "  
    "; + $adminCommands .= sprintf(gTranslate('core', "Welcome, %s"), $displayName) . "  
    "; } if ($gallery->app->gallery_slideshow_type != "off" && $numPhotos != 0) { - $iconText = getIconText('display.gif', _("slideshow")); + $iconText = getIconText('display.gif', gTranslate('core', "slideshow")); $iconElements[] = ' null)) .'">'. $iconText .''; } if ($gallery->user->canCreateAlbums() && !$gallery->session->offline) { - $iconText = getIconText('folder_new.gif', _("new album")); + $iconText = getIconText('folder_new.gif', gTranslate('core', "new album")); $iconElements[] = ''. $iconText .''; } if ($gallery->user->isLoggedIn() && !$gallery->session->offline) { + if ($gallery->user->isAdmin()) { + + $iconText = getIconText('unsortedList.gif', gTranslate('core', "Administer startpage")); + $linkurl = makeGalleryUrl('administer_startpage.php', array('type' => 'popup')); + $iconElements[] = popup_link($iconText, $linkurl, true); + + $iconText = getIconText('kdf.gif', gTranslate('core', "admin page")); + $iconElements[] = ''. $iconText .' '; + + $docsUrl = galleryDocs('admin'); + if ($docsUrl) { + $iconText = getIconText('info.gif', gTranslate('core', "documentation")); + $iconElements[] = "". $iconText .''; + } + } + if ($gallery->userDB->canModifyUser()) { - $iconText = getIconText('yast_sysadmin.gif', _("preferences")); - $iconElements[] = popup_link($iconText, "user_preferences.php", false, true, 500, 500); + $iconText = getIconText('yast_sysadmin.gif', gTranslate('core', "preferences")); + $iconElements[] = popup_link($iconText, "user_preferences.php", false, true, 500, 500); + } + + if (!$GALLERY_EMBEDDED_INSIDE) { + $iconText = getIconText('exit.gif', gTranslate('core', "logout")); + $iconElements[] = ''. $iconText .''; } - - if ($gallery->user->isAdmin()) { - $docsUrl = galleryDocs('admin'); - if ($docsUrl) { - $iconText = getIconText('info.gif', _("documentation")); - $iconElements[] = "". $iconText .''; - } - - $iconText = getIconText('kdf.gif', _("admin page")); - $iconElements[] = ''. $iconText .' '; - } - if (!$GALLERY_EMBEDDED_INSIDE) { - $iconText = getIconText('exit.gif', _("logout")); - $iconElements[] = ''. $iconText .''; - } } else { - if (!$GALLERY_EMBEDDED_INSIDE) { - $iconText = getIconText('identity.gif', _("login")); - $iconElements[] = popup_link($iconText, "login.php", false, true, 500, 500); - - if (!strcmp($gallery->app->selfReg, 'yes')) { - $iconText = getIconText('yast_sysadmin2.gif', _("register")); - $iconElements[] = popup_link($iconText, "register.php", false, true, 500, 500); - } - } + if (!$GALLERY_EMBEDDED_INSIDE) { + $iconText = getIconText('identity.gif', gTranslate('core', "login")); + $iconElements[] = popup_link($iconText, "login.php", false, true, 500, 500); + + if (!strcmp($gallery->app->selfReg, 'yes')) { + $iconText = getIconText('yast_sysadmin2.gif', gTranslate('core', "register")); + $iconElements[] = popup_link($iconText, "register.php", false, true, 500, 500); + } + } } $adminbox["text"] = $adminText; @@ -238,37 +246,36 @@ if ( (sizeof($albumDB->brokenAlbums) || sizeof($albumDB->outOfDateAlbums)) && $gallery->user->isAdmin()) { echo "\n
    "; - echo "\n

    ". _("Attention Gallery Administrator!") ."

    "; + echo "\n

    ". gTranslate('core', "Attention Gallery Administrator!") ."

    "; if (sizeof($albumDB->brokenAlbums)) { - echo sprintf(_("%s has detected the following %d invalid album(s) in your albums directory
    (%s):"), + echo sprintf(gTranslate('core', "%s has detected the following %d invalid album(s) in your albums directory
    (%s):"), Gallery(), sizeof($albumDB->brokenAlbums), $gallery->app->albumDir); echo "\n

    "; foreach ($albumDB->brokenAlbums as $tmpAlbumName) { echo "
    $tmpAlbumName\n"; } - echo "\n

    ". _("Please move it/them out of the albums directory.") ; + echo "\n

    ". gTranslate('core', "Please move it/them out of the albums directory.") ; } if(sizeof($albumDB->outOfDateAlbums)) { - echo sprintf(_("%s has detected that %d of your albums are out of date."), + echo sprintf(gTranslate('core', "%s has detected that %d of your albums are out of date."), Gallery(), sizeof($albumDB->outOfDateAlbums)); echo "\n
    "; - echo sprintf(_("Please %s."), popup_link(_("upgrade those albums"), "upgrade_album.php",0,0,500,500,"error")); + echo sprintf(gTranslate('core', "Please %s."), popup_link(gTranslate('core', "upgrade those albums"), "upgrade_album.php",0,0,500,500,"error")); } echo "\n
    \n"; } - if (getRequestVar('gRedir') == 1 && ! $gallery->session->gRedirDone) { - echo "\n
    "; - echo "\n

    ". _("Attention!") ."

    "; + echo "\n
    "; + echo "\n

    ". gTranslate('core', "Attention!") ."

    "; - echo sprintf(_('The album or photo that you were attempting to view either does not exist, or requires user privileges that you do not possess. %s'), ($gallery->user->isLoggedIn() && !$GALLERY_EMBEDDED_INSIDE ? '' : sprintf(_("%s and try again."), - popup_link(_("Log in"), "login.php", false, true, 500, 500)))); - echo "\n
    \n"; - $gallery->session->gRedirDone = true; + echo sprintf(gTranslate('core', 'The album or photo that you were attempting to view either does not exist, or requires user privileges that you do not possess. %s'), ($gallery->user->isLoggedIn() && !$GALLERY_EMBEDDED_INSIDE ? '' : sprintf(gTranslate('core', "%s and try again."), + popup_link(gTranslate('core', "Log in"), "login.php", false, true, 500, 500)))); + echo "\n
    \n"; + $gallery->session->gRedirDone = true; } ?> @@ -280,14 +287,14 @@ $end = min($start + $perPage - 1, $numAlbums); for ($i = $start; $i <= $end; $i++) { if(!$gallery->album = $albumDB->getAlbum($gallery->user, $i)) { - echo gallery_error(sprintf(_("The requested album with index %s is not valid"), $i)); + echo gallery_error(sprintf(gTranslate('core', "The requested album with index %s is not valid"), $i)); continue; } $isRoot = $gallery->album->isRoot(); // Only display album if it is a root album if($isRoot) { - if (strcmp($gallery->app->showOwners, "no")) { - $owner = $gallery->album->getOwner(); - } + if (strcmp($gallery->app->showOwners, "no")) { + $owner = $gallery->album->getOwner(); + } $tmpAlbumName = $gallery->album->fields["name"]; $albumURL = makeAlbumUrl($tmpAlbumName); ?> @@ -315,13 +322,13 @@ $gallery->html_wrap['pixelImage'] = getImagePath('pixel_trans.gif'); $scaleTo = $gallery->app->highlight_size; list($iWidth, $iHeight) = $gallery->album->getHighlightDimensions($scaleTo); - if (!$iWidth) { - $iWidth = $gallery->app->highlight_size; - $iHeight = 100; + if (empty($iWidth)) { + $iWidth = $gallery->app->highlight_size; + $iHeight = 100; } $gallery->html_wrap['imageWidth'] = $iWidth; $gallery->html_wrap['imageHeight'] = $iHeight; - $gallery->html_wrap['imageTag'] = $gallery->album->getHighlightTag($scaleTo,'', _("Highlight for Album:") ." ". $gallery->album->fields["title"]); + $gallery->html_wrap['imageTag'] = $gallery->album->getHighlightTag($scaleTo,'', gTranslate('core', "Highlight for Album:") ." ". $gallery->album->fields["title"]); $gallery->html_wrap['imageHref'] = $albumURL; $gallery->html_wrap['frame'] = $gallery->app->gallery_thumb_frame_style; includeHtmlWrap('inline_gallerythumb.frame'); @@ -338,8 +345,13 @@ @@ -356,21 +368,30 @@ album, "description") ; - if ($description != "") { + if (!empty($description)) { echo "\n
    "; echo "\n\t$description"; echo "\n
    "; - } + } + /* + * Owner + */ if (strcmp($gallery->app->showOwners, "no")) { echo "\n
    "; - echo _("Owner:") . ' '. showOwner($owner); + echo sprintf(gTranslate('core', "Owner: %s"),showOwner($owner)); echo '
    '; } + /* + * Url (only for admins and owner) + */ if ($gallery->user->isAdmin() || $gallery->user->isOwnerOfAlbum($gallery->album)) { - echo _("url:") . ''; + echo gTranslate('core', "url:") . ''; if (!$gallery->session->offline) { echo breakString(urldecode($albumURL), 60, '&', 5); } else { @@ -381,58 +402,80 @@ if (ereg("album[[:digit:]]+$", $albumURL)) { if (!$gallery->session->offline) { echo '
    '. - _("Hey!") . - sprintf(_("%s so that the URL is not so generic!"), - popup_link(_("Rename this album"), "rename_album.php?set_albumName={$tmpAlbumName}&index=$i",0,0,500,500,"error")); + gTranslate('core', "Hey!") . + sprintf(gTranslate('core', "%s so that the URL is not so generic!"), + popup_link(gTranslate('core', "Rename this album"), "rename_album.php?set_albumName={$tmpAlbumName}&index=$i",0,0,500,500,"error")); echo ''; } } } - ?> -
    - - album->getLastModificationDate() ); - $visibleItems=array_sum($gallery->album->numVisibleItems($gallery->user)); - echo " "; // Need a space between these two text blocks - echo pluralize_n2(ngettext("This album contains 1 item.", "This album contains %d items.", $visibleItems), $visibleItems); + echo "\n
    "; + + /* + * Created / Last Changed + */ + $creationDate = $gallery->album->getCreationDate(); + $lastModifiedDate = $gallery->album->getLastModificationDate(); + if($creationDate) { + printf(_("Created on %s, last changed on %s."), $creationDate, $lastModifiedDate); + } + else { + printf(gTranslate('core', "Last changed on %s."), $lastModifiedDate); + } + + /* + * Amount of items + */ + echo ' '; // Need a space between these two text blocks + list($visibleItems) = $gallery->album->numItems($gallery->user, true); + + echo gTranslate('core', "This album contains 1 item.", "This album contains %d items.", $visibleItems); + + /* + * Click counter + reset for it + */ if (!($gallery->album->fields["display_clicks"] == "no") && !$gallery->session->offline) { -?> -
    album->getClicks(); - echo sprintf(_("This album has been viewed %s since %s."), - pluralize_n2(ngettext("1 time", "%d times", $clickCount), $clickCount, _("0 times")), - $gallery->album->getClicksDate()); -} -$albumName=$gallery->album->fields["name"]; -if ($gallery->user->canWriteToAlbum($gallery->album) && - (!($gallery->album->fields["display_clicks"] == "no"))) { - echo " ".popup_link("[" . _("reset counter") ."]", doCommand("reset-album-clicks", array("set_albumName" => $albumName), "albums.php"), 1); -} -if($gallery->app->comments_enabled == 'yes') { - // if comments_indication are "albums" or "both" - switch ($gallery->app->comments_indication) { - case "albums": - case "both": - $lastCommentDate = $gallery->album->lastCommentDate($gallery->app->comments_indication_verbose); - print lastCommentString($lastCommentDate, $displayCommentLegend); - } // end switch -} -?> + $clickCount = $gallery->album->getClicks(); + + echo "\n
    "; + printf(gTranslate('core', "This album has been viewed %s since %s."), + gTranslate('core', "1 time", "%d times", $clickCount, gTranslate('core', "0 times")), + $gallery->album->getClicksDate()); + } + $albumName = $gallery->album->fields["name"]; + if ($gallery->user->canWriteToAlbum($gallery->album) && + (!($gallery->album->fields["display_clicks"] == "no"))) { + echo " ".popup_link("[" . gTranslate('core', "reset counter") ."]", doCommand("reset-album-clicks", array("set_albumName" => $albumName), "albums.php"), 1); + } + + /* + * Comment Indicator + */ + if($gallery->app->comments_enabled == 'yes') { + // if comments_indication are "albums" or "both" + switch ($gallery->app->comments_indication) { + case "albums": + case "both": + $lastCommentDate = $gallery->album->lastCommentDate($gallery->app->comments_indication_verbose); + print lastCommentString($lastCommentDate, $displayCommentLegend); + } // end switch + } -     -"; + // End Album Infos + + // Start tree if ( isset($gallery->app->albumTreeDepth) && $gallery->app->albumTreeDepth > 0) if (isset($gallery->app->microTree) && $gallery->app->microTree == 'yes') { ?>
    - +
    -     @@ -440,7 +483,7 @@
    - - album, "title", $albumURL) ?> + album, "title", $albumURL); + if ($gallery->user->canDownloadAlbum($gallery->album) && $gallery->album->numPhotos(1)) { + $iconText = getIconText('compressed.png', gTranslate('core', "Download entire album as archive"), 'yes'); + echo popup_link($iconText, "download.php?set_albumName=$tmpAlbumName",false,false,500,500); + } + ?>
    - + +
    @@ -449,7 +492,7 @@ if ($displayCommentLegend) { //display legend for comments echo '

    *'; - echo ''. _("Comments available for this item.") .'

    '; + echo ''. gTranslate('core', "Comments available for this item.") .'

    '; } ?> diff -Naur gallery-1.5.1/AUTHORS gallery-1.5.2/AUTHORS --- gallery-1.5.1/AUTHORS 2005-08-09 16:32:13.000000000 +0200 +++ gallery-1.5.2/AUTHORS 2005-08-11 14:55:37.000000000 +0200 @@ -1,4 +1,4 @@ -$Id: AUTHORS,v 1.24.4.1 2005/08/09 14:32:13 jenst Exp $ +$Id: AUTHORS,v 1.25 2005/08/11 12:55:37 jenst Exp $ Many people have dedicated their time to making Gallery what it is today. Here is a list of folks in alphabetical order who have diff -Naur gallery-1.5.1/block-random.php gallery-1.5.2/block-random.php --- gallery-1.5.1/block-random.php 2005-09-13 00:40:44.000000000 +0200 +++ gallery-1.5.2/block-random.php 2006-01-06 07:31:30.000000000 +0100 @@ -1,7 +1,7 @@ /modules.php?op=modload&name=gallery&file=index&include=block-random.php * - * Mambo: + * Mambo / Joomla : * http:///index.php?option=com_gallery&Itemid=XXX */ @@ -59,9 +59,9 @@ if ($rebuild) { scanAlbums(); - saveCache(); + saveGalleryBlockRandomCache(); } else { - readCache(); + readGalleryBlockRandomCache(); } $i = 0; @@ -71,7 +71,7 @@ } while (empty($success) && $i < $gallery->app->blockRandomAttempts); if (empty($success)) { - echo '
    No photo chosen.
    '; + echo _("No photo chosen."); } function doPhoto() { @@ -83,20 +83,21 @@ if (!empty($index)) { $id = $album->getPhotoId($index); - echo "" - . '
    ' - . $album->getThumbnailTag($index) - . '
    '; - - $caption = $album->getCaption($index); - if ($caption) { - echo '
    ' . $caption . '
    '; - } - - echo '
    From: ' - . '' - . $album->fields['title'] - . '
    '; + $caption = $album->getCaption($index) ? '
    '. $album->getCaption($index) : ''; + $photoUrl = makeAlbumUrl($album->fields['name'], $id); + $imageUrl = $album->getThumbnailTag($index); + $albumUrl = makeAlbumUrl($album->fields['name']); + $albumTitle = $album->fields['title']; +?> +
    +
    + + + +
    + $albumTitle"); ?> +
    + album->fields['rows'] * $gallery->album->fields['cols']; if (!$perPage) { - $perPage = 5; + $perPage = 5; } } @@ -51,8 +51,8 @@ if ($captionedAlbum != $gallery->album->fields['name']) { echo gallery_error(_("Captioned album does not match current album - aborting changes!")); - echo '

    '; - echo ''; + echo '

    '; + echo ''; exit; } @@ -61,39 +61,39 @@ while ($i < $start) { $i++; } - + $count = 0; while ($count < $perPage && $i <= $numPhotos) { - if ($gallery->album->isAlbum($i)) { - $myAlbumName = $gallery->album->getAlbumName($i); - $myAlbum = new Album(); - $myAlbum->load($myAlbumName); - $myAlbum->fields['description'] = getRequestVar("new_captions_$i"); - $myAlbum->save(array(i18n("Text has been changed"))); - - } else { - $gallery->album->setCaption($i, getRequestVar("new_captions_$i")); - $gallery->album->setKeywords($i, getRequestVar("new_keywords_$i")); - if (isset($extra_fields)) { - foreach ($extra_fields[$i] as $field => $value) { - $gallery->album->setExtraField($i, $field, trim($value)); - } - } - } + if ($gallery->album->isAlbum($i)) { + $myAlbumName = $gallery->album->getAlbumName($i); + $myAlbum = new Album(); + $myAlbum->load($myAlbumName); + $myAlbum->fields['description'] = getRequestVar("new_captions_$i"); + $myAlbum->save(array(i18n("Text has been changed"))); + + } else { + $gallery->album->setCaption($i, getRequestVar("new_captions_$i")); + $gallery->album->setKeywords($i, getRequestVar("new_keywords_$i")); + if (isset($extra_fields)) { + foreach ($extra_fields[$i] as $field => $value) { + $gallery->album->setExtraField($i, $field, trim($value)); + } + } + } - $i++; - $count++; + $i++; + $count++; } $gallery->album->save(array(i18n("Text has been changed"))); } if (isset($cancel) || isset($save)) { - if (!isDebugging()) - header("Location: " . makeAlbumHeaderUrl($captionedAlbum)); - else - echo "
    " . _("Debugging: Click here to return to the album") . "
    "; - return; + if (!isDebugging()) + header("Location: " . makeAlbumHeaderUrl($captionedAlbum)); + else + echo "
    " . _("Debugging: Click here to return to the album") . "
    "; + return; } #-- did they hit next? --- @@ -124,7 +124,7 @@ $bordercolor = $gallery->album->fields["bordercolor"]; if (!$GALLERY_EMBEDDED_INSIDE) { - doctype(); + doctype(); ?> @@ -132,9 +132,9 @@ -+ -+ - - + + + +album->fields["rows"]; +$cols = $gallery->album->fields["cols"]; +$perPage = $rows * $cols; +$page = (int)(ceil($index / ($rows * $cols))); + +$iconElements = array(); +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); + } +} + +$navigator["id"] = $id; +$navigator["allIds"] = $gallery->album->getIds($gallery->user->canWriteToAlbum($gallery->album)); +$navigator["fullWidth"] = "100"; +$navigator["widthUnits"] = "%"; +$navigator["url"] = "."; + +#-- breadcrumb text --- +$upArrowURL = gImage('nav_home.gif', _("navigate UP")); + +foreach ($gallery->album->getParentAlbums(true) as $navAlbum) { + $breadcrumb["text"][] = $navAlbum['prefixText'] .': '. + galleryLink($navAlbum['url'], $navAlbum['title'] .' '. $upArrowURL, array('class' => 'bread')); +} + +$breadcrumb["text"][] = galleryLink( + makeAlbumUrl($gallery->session->albumName, $id), + _("Original photo") .' '. $upArrowURL, + array('class' => 'bread') + ); + +$adminbox["commands"] = makeIconMenu($iconElements, 'right'); + +includeLayout('navtablebegin.inc'); +includeLayout('adminbox.inc'); +includeLayout('navtablemiddle.inc'); + +$breadcrumb["bordercolor"] = $gallery->album->fields["bordercolor"]; +includeLayout('breadcrumb.inc'); +includeLayout('navtableend.inc'); + +echo "
    \n\t"; + +list($width, $height) = $photo->getDimensions($full); + +//print_r($photo); + +echo showImageMap($index); + +$allImageAreas = $gallery->album->getAllImageAreas($index); + +if (!empty($allImageAreas)) { + echo "\n". '"; + + $photoTag = $gallery->album->getPhotoTag($index, $full,"id=\"myPic\" usemap=\"myMap\""); +} +else { + $photoTag = $gallery->album->getPhotoTag($index, $full,"id=\"myPic\""); +} +?> + +
    +"; +echo _("Click the questionmark icon for helpful instructions."); +echo popup_link('', 'help/imagemap.php'); +?> +
    + + 'areas'), + array('index' => $index, 'formaction' => '') + ); +?> + + + + + +
    + + + + +
    + "> +
    +
    +
    +
    + + " onclick="document.areas.formaction.value='create'"> +
    + 10) ? 10:sizeof($allImageAreas); + + echo _("Select entries to show image area in your photo."); + echo "
    "; + + echo "\n
    "; + echo ""; + + echo "\n
    "; + echo ""; + + echo '
    '. gTranslate('core', "Be aware, that the text of ALL selected entries will be updated!") .'
    '; +} +else { + echo _("No ImageMaps"); +} +?> +     		+
    + +
    +
    + + +
    +app->photoAlbumURL .'/js/wz_tooltip.js">'; +} +?> + + + + + \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/collapse.gif gallery-1.5.2/images/collapse.gif --- gallery-1.5.1/images/collapse.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/collapse.gif 2005-10-20 15:37:00.000000000 +0200 @@ -0,0 +1,2 @@ +GIF89aæ{~£æ<ÿûûûŽ­èf–î>t×F†üm ÿÌÚòH‡üP~ÓI€æèëñ4rä³ÂÞäëù|›ÔÎàÿJ€ä²Ún•ÜeŽÛ÷ùüž³Û±Æìùúþ°ÅëðððÁÒòÎßÿ÷÷÷^ˆÕÜßæ¹Èäìðö…¤Ü;€ÿ¬çõøýÖÛãäëø>uÙ;pÕ¬æ[ˆÜÜæö¡ºé5räe—òZŠãìñû«á6vëáéø—³äFvÑËÒÞÎÙíKyÐçíùQÙtéäêõyŸå’¯æÔàôt×H‡ü÷÷÷’¯æèëñP~Ó£¼êÍÚôOŠöòõû|›Ô¬çI€æ¹Èäž³Û²Ú±ÆìJ€äl”àn•ÜeŽÛ4räîóûõøýÌÚò;€ÿÜßæÖÛã÷ùüððð…¤Ü°Å뎭è^ˆÕ³ÂÞìðöìñú@ƒÿ¨Âõ>uÙäëøQƒàZŠãçíù«á’¯çÎÙíGxÑÇÖò[ˆÜ—³äŽ±ò;pÕ¡ºéHˆü7v뎭å4råâêøÒâþTlu·p +Ô»¥„‡# èÑæ–{y„xA°#„žÐA."Ѓ†A†ªÜRƒ2Ca°A‰0XNHØà¤L‚E*JØ@¡AŠ"Düd$`… +R„ SP ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/favicon.ico gallery-1.5.2/images/favicon.ico --- gallery-1.5.1/images/favicon.ico 2004-09-11 04:01:53.000000000 +0200 +++ gallery-1.5.2/images/favicon.ico 2005-10-03 23:50:12.000000000 +0200 @@ -1 +1,2 @@ -h( @ÿÿÿûÿÿ©Ñÿxáÿñòòm¤È}œ£¾Öá~Œœ¤¿ÆŒ§}‰—Œ¯ÄÿÿýðòñççåËÔÌÚàÚÿþûÿþýýû÷ýùôúõìùôëôèÖòéÚíÜÃäÚÉûöîöêÚìÖ¹÷íáïÝÃõëÝðàÉßÛÎßÝØÚº‘åвúôêíÛÀòâÍûïâÚм׹›ÖÁ¤ÖÇ­ÖŬßÄ êÓ²æÈ¢þüûöìÜÛºŒÓ·‘ѵÌÁ®Ì«€Ê³“×·Ô´‰Ùº’îÞÇÑ°‡ýúöåÍ®ÅrË¥tϬƒÃ¿³º_È¢sçÓ¶èа׸ðåÙíÙ¼¹‹]þüùç̥ϦsЭÇ t³‚R²S½‘fͨ~ѨuÖ¶ŽÀ™nˤzÔ²ŠóëâòèÛÈ£zÀ–k»e±‰^µ…X°…[·‰]È¢w˧}¿“dŘg¾“iº`ìÛÂñãÏ˪„¶ˆ]¯|JÇk­wD«„^°UªS«zM´’n±S©vF»–pÊŸnãÂʩÁ“`§uH§tF¨‡µ†Y§{TôæÖ¦qC¨vIÀ”fÕµÛÀ˳°‚U¦pCªvIĦƒ¡k<¥o=¥n>¡wP­|NɧÒ°Š¬Xže2½`±Ušg;²ƒWÒ¨tÞÛÒÄšmša4žf7À {d3ÃœrÓ»›Ø¹“¸‰Z¯TÅ¡xÒ½ŸäÈŸÓ»™ÕĨºŽbÛ‘ ÝÚÔ%0SSNd;7S¨¢G£UCS¤rš¡UŸ ¦S9b€s”‘…Œp:Š–ƒŽ­†vvvyž©zw}xt™‹§‚›“˜gnfceok{œiq~‡lRYWVa`X\-[•ˆIHEKSZQJM&^Bhj<@Dª>‰1T_62]?¥G)*=' !#A„3P|ûÿøÿðà?À€€Ààðøü1þ`ÿ` \ Pas de fin de ligne à la fin du fichier. + h(    ãáß_íìëqòòóïïð.èßÙîêáÛÿâàßÇèææ‚ñññ +÷÷÷:êãÞìã¼ÿÙ°ÿôä×ÿë×ÇÿéãÞÙçææcùùùéãàìæŪÿÎ[ÿÈ—rÿôä×ÿÍ\ÿâ¹™ÿêÛÏÿçäã¸éèè'ñññåßÜÖèÉ°ÿÕ™kÿË‘fÿôä×ÿÚ¦~ÿÏ’cÿÏ‘bÿÕ›oÿæĨÿêßÖüèæå¨ïïðêäàÄêϸÿÛ¦}ÿןsÿ׳–ÿôä×ÿÔ›nÿÖŸtÿÖŸtÿÕrÿÔšnÿà²ÿéιÿéáÜççæåféééõåÙÁæÀ ÿÝ©ÿÓ¥€ÿôä×ÿÞ®‡ÿÚ¦~ÿÛ¨ÿÛ¨ÿÛ¨ÿÛ¨ÿÚ¥{ÿÚ¤yÿ廚ÿìÙÊÿæßÚ¼ñÞÑóáÔ¥éƪÿäĪÿôä×ÿÞ­…ÿోÿಌÿಌÿಌÿಌÿಌÿಌÿÞ®†ÿ㸔ÿöå×àøìä°í϶ÿôä×ÿôä×ÿçÀžÿ底ÿ漘ÿ漘ÿ漘ÿ漘ÿ漘ÿ底ÿìγÿ÷ìä[òàÓƒîÒ¹ÿèáÿôä×ÿôä×ÿéÄ¡ÿèÀœÿèŸÿè ÿèÁžÿêÅ¥ÿõæÛÊõæÜzðØÁÿä¹”ÿ伜ÿôä×ÿìͲÿçÀœÿèÁžÿçÁÿðØÃ÷úòí>ùïè|ïÕ¿þÝ©ÿݬ‡ÿôä×ñôä×ÿèáÿêÈ©ÿ÷êá³ðÛÎSñÚÇÿñÜËÖôäÚôãÙóáÔ²ôâÔòøîéõçÝhûôðIôåÛ+ÿÿ˜ÿÿðÿàÀ€€Ààøüþgÿÿÿÿ \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/green_trafficlight.gif gallery-1.5.2/images/green_trafficlight.gif --- gallery-1.5.1/images/green_trafficlight.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/green_trafficlight.gif 2005-10-20 15:37:00.000000000 +0200 @@ -0,0 +1,3 @@ +GIF89a ÷USSk‰–5CKzŠ”ÌŽ¢È69Ju$)ty}‚ž¼€œ­rŽ¦s|NKJ±ÂÌxxx”ªÔ5‹l‰§inrYVUm„‘|™ºg£pþ1m0Š£ÄQ`h¶¾Ñƒ¡Äl³ºÊnŽ ‰Ÿ¬îºÂÔu’¥\Vlz/NU20/‡š¦ú).1J_ky~€l}‡C@>ÇSepDEEZ^v,&$#F “7[<3222/. 'ëïñŒ§µ8FNáçëõ÷øçíðš³À_x†Ì×Þÿÿÿûûük‡–¼ÌÕn‰˜¯ÄÑbaa ÿ Xo|MSlºÈзÿ·UÿU©Š—©ÑÜâ–ÿ–o‹š9>QZr‰ ¬’ª¸gjl+ÿ+´ÃÍÉÕÛ€ÿ€÷øùõýýþ*!;s…x•¨š­Í}—³x•§qsvw–»lŠ—’ªÏv„„ ÊŠª¼¥°Á$!¤¹Æ©±À®¸Ñe“TRNhff³ºÃn†”>PUŸ¬³J^p\XR\ì\Ž­Þ‰¨Ë­·ÊAQ[OOOVhq‡“ª‚©r«v‚ˆ!`wˆz…%&'noo3AGu†k{„{…‹lr¸nƒ‘±¶½‘°Ñopq{šÃEGH€ƒŠ“žB<8Š¥ÏŽ©ÓZr‚ \ø\ž·Ö pŽ«r’¦¤µÐ«·Ó![›®Ôtvxwˆ’^~Ž`y…28:<<Nÿÿÿ!ùÿ, ÿÿ H° Áƒ*\È°¡Á;1äH”ãÎÀL…½y³¨P¦7n¬(Ð'*4¨àdBà&AHÎ<à5†Š M%%¸0@IÿÉÑ@ˆMä<úéÍX(qPð&Ò¿?ö\XÀB Ë{h €C48ø'CÝ1 ĤاEÛ;0Áåþ +œèÓ§CüýÛ P Rd{µíŸ?"zȺAÊ€f6xyÑ ÚfþÍpdÄâØ«ìoŠY¤@}Š…Êß (x9Š€É Õƒ;u…:*–pè1BÂlùüM‚6á“úéX›ôÏD?âE™¦Í]K=T´xÂ¥Ô,*zð¬ÀW€6ø¬€Ç?e•Â®lC’~o„J9 ¼!à?tÔáÏ…þÔAA{ q!{T!†nèЉ(¦(P@; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/behavior-capplet.gif gallery-1.5.2/images/icons/behavior-capplet.gif --- gallery-1.5.1/images/icons/behavior-capplet.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/behavior-capplet.gif 2005-11-21 22:06:24.000000000 +0100 @@ -0,0 +1,2 @@ +GIF89aæM›››ÿÁ5ýÖYÿ×[Õ”zóʼnݙê5çÇ“Ú·œÿ´ÿÉÿ»——˜ñÀë¾$ÑŸKŠWDÙŒm†cYù¨OÜ„VüŸ+Äž|ÿ™»wMì¶}ìÔÌÍÍΰ þÚ9þÍâŽd•³éÿÄ'™†‚ÿÕJå±”­˜¬lEúˆæn(ÿ¶ÿ»Jæˆ6ί{úÎ\÷ìãßÖÌÞÜÚÿ­Á¼¼à·Dÿßÿ­$ÿÔ…™}tÿà_É–‚••—ÑÈÈùÊ;ýÖG™™šúwùÌjÿ¡òàÛúÑ ü×+Œ·ÿMsì©Ïÿ§§§÷÷÷ÞÞÞYYYÿÿÿ!ùM,˜€M‚I…†…L‚M9J‘‰‚6*0K›K‡ˆM@B-H¥HI’J‰) !F±Iœ›‰( +D#G¼I¦¥”2 =/I±É” "E1¼Ó”M,4&¨’Õ+$>AJ³´Õ8.KLïðÕ;'75øÕŠ?<: ¼)RԀÌ Î dŽV­…MâI¬; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/compressed.png gallery-1.5.2/images/icons/compressed.png --- gallery-1.5.1/images/icons/compressed.png 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/compressed.png 2005-10-17 19:46:12.000000000 +0200 @@ -0,0 +1,8 @@ +‰PNG + + IHDR(-SPLTE   + ³M6€/v:/OV`mƒ˜Xž~°Óq­Ò‹ÌìS”ª4=Í- ÿ¥„ÿ³žÿÀ±Z +  +.`s’Ýà&Ó¿Ë8.­- Š·F$œ(¡3kX7WI>ôÿÿ + ¨ÑÉÇÿÐÊÿ¾¹ÿÒÆÿãÃÿ‡ÿÁjÿ³RÿÐvô¤]óôæ ¨½¸¡%ÿàÚÿåâÿàÑÿùÏÿãšú¶GÿÄEÿ½Hê¿c +òÿú´ÃÊ +¤3#ÿ×ÈÿîäÿñÚöè·îÚ„ûËOÿÆ;öÀBíÏoàùö·¾Û§ÿàÁÿéÐÿïÌìÉæ¾fÿÁEÿ¸3ýºEá·e îýÿ3²³ì©,ÿÜ°þº•ôÅ™ôÎûÍuÿ¼EÿÑRÿÐc©}4Üîÿ@´Áö '‡6ÿñ½ÿá³îÒ ÜÀôÐzÿÆ[ñ¯?¿…"ЯhÌîí&¡Òá y@$ =  UW“ÈÂG1 DR[\nxi~‰¥»“¸Óˆ²ÈŠ¯·#223)% +&r“² ;B&Fo…#-No)GdŒ.R` "Vo+Cv‘&,K`™ÓtRNSÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿS÷%bKGDÿ¥òÅ pHYsHHFÉk>iIDAT(ÏcüÏŒðÈúÏÁÈø*Àø–Q˜ÜcáG`@8ÌÀ‡"àÃ@H ~Ú°Äе!ŒŒÁ*ÁNŸS•`XäügbŒb€ €ÀrÆ„ÀJ¨ž¨4ÌZ"Àµ0Ã1yIEND®B`‚ \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/help.gif gallery-1.5.2/images/icons/help.gif --- gallery-1.5.1/images/icons/help.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/help.gif 2005-12-12 00:38:11.000000000 +0100 @@ -0,0 +1,5 @@ +GIF89a÷ÿŽ¯ÔáéñÛâì4]•}ŸÈFkŸBiŸ¾ËÝNt§µÅÛ%OŠDk ¦¸Ñ2Y‘[{§ˆªÐ†¨Ï8`˜†§Îƒ¤Ë€£ÊLr¥Pq ¡É‡ž¾5[’MoŸHo£}–»s—Áw‘¶=a—b†µ5\”(P‹Nq¢Kr¥U{¬àæî]‚²ÏØåèíó*RŒW}®ÉÉÉ@gx›Åçìòìðõîò÷w™Ãk¼æëòéîôóóóÜÜÜ ²Ì©ºÒ£´Îíñöp“¿÷ùûöööõöù:b™g‹¹úûü’³×jŽ»-Vd‰·3[”³ÁÖçìó+S‚™¼Pv¨>b—æëñ_ƒ³´Â×ÈÓ㘭ÉQw©lˆ°Rxª\{©°¿ÕàààÁÎßc‡¶,TŽ¡³Í²ÂØPt¤Yy¦w…›k¸b­€›À)QŒßåîéïöcˆ¶Ÿ»Ú”¨ÅbªÙàë/W‘¸¸¸8`—¯¿Õr³kŽ»7^•a†´ž²Ìéîõ¥¥¥òòòÈÖç;cšýþþéíó£º×´ÄÙTz¬â\Š’T; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/nav_first.gif gallery-1.5.2/images/icons/nav_first.gif --- gallery-1.5.1/images/icons/nav_first.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/nav_first.gif 2005-12-09 00:32:42.000000000 +0100 @@ -0,0 +1,3 @@ +GIF89a æëíéùùùö÷õ¡£œïðîòóñLMIˆ‹„ãæáðñîóôòüüüýýýXYU÷øöìíêêìéjkgööõÇÉÄýýüz|wëìêëëꊌ†ÈÊÅíïëàáÞŽŒëìéZ[X®¯«”–øùøÁÿ‚~ÔÖÒÜàÙprmøø÷ôõô¼¿¸æèãlmkîðídfa•—ˆŠ„KLI|}yéêèôôò|~yîïìÜÜ܉Œ†³³²çéæhieª«ªïñîVWTôõóÎÐÍõöô„…‚—˜•°²« £›ûûûce`µ¸°íïìWXU°±®¬¯§›˜×ÙÖïðí”—ÏÏΟ¡›ÉËÅ×ØÖdeaûûúíîì­°¨ÙÙÙFGDÿÿÿÿÿÿ!ù[, y€W‚[„…[G‚ZW†[)RKZ†C9UZD.O„Q$ N%Z [2*3/4?V<7& 1"5  +>( +-'T[#S!E F  „:BI@…JH,0YYŒ+YòíŒ;=Y; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/nav_last.gif gallery-1.5.2/images/icons/nav_last.gif --- gallery-1.5.1/images/icons/nav_last.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/nav_last.gif 2005-12-09 00:32:42.000000000 +0100 @@ -0,0 +1,3 @@ +GIF89a æëíéùùùö÷õ¡£œïðîòóñLMIˆ‹„ãæáðñîóôòüüüýýýXYU÷øöìíêêìéjkgööõÇÉÄýýüz|wëìêëëꊌ†ÈÊÅíïëàáÞŽŒëìéZ[X®¯«”–øùøÁÿ‚~ÔÖÒÜàÙprmøø÷ôõô¼¿¸æèãlmkîðídfa•—ˆŠ„KLI|}yéêèôôò|~yîïìÜÜ܉Œ†³³²çéæhieª«ªïñîVWTôõóÎÐÍõöô„…‚—˜•°²« £›ûûûce`µ¸°íïìWXU°±®¬¯§›˜×ÙÖïðí”—ÏÏΟ¡›ÉËÅ×ØÖdeaûûúíîì­°¨ÙÙÙFGDÿÿÿÿÿÿ!ù[, z€WG[„…[WˆKR)†‡ZWDZU9C†Z Z%N $Q„O./3*2[7<V?4 +(> + 5"1 &F E!S#[T'-IB:„  0,HJ…@Y+ŽYYY=;Ž[òY; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/nav_next.gif gallery-1.5.2/images/icons/nav_next.gif --- gallery-1.5.1/images/icons/nav_next.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/nav_next.gif 2005-12-09 00:32:42.000000000 +0100 @@ -0,0 +1,3 @@ +GIF89a æóôòýýýÖÖÖ÷øöïñîíîììíêëíéøøøö÷õãæáôõóôõôˆ‰‡×××××ÖîðíæèãJKHúúùVWTüüûª«¨ÅÇÃÿÿÿïðîìíëûûúþþþÏÑÌêìé««ªòóðÕÕÕFGDUVSòòòçèæüüüKLIíïìêêéèèèûûûðñîøùøyzwtvq¾À¼äæãÍÏË™›•¬­ª‰Šˆ’•¨©§ÜàÚåæãÕÖÕŽ‹kkiƒ„éêè[]YPQNhie¾À»fhd˜›•wxt¿Á¼ÑÑÑÍÍÍÒÓј™•PQM²µ®Þßܤ§Ÿ¿Â¼ÉÊÇwyu¤¦ [\Xèéç¹»¸\]ZkliŠÜàÙÐÒϬ¬«ÎÎÍÉÊƬ¯§ghe€‚}stp£¥¡ÑÒÐõöõ¢¥Ÿ»½¹‚„~£¥ åæ媪©ÎÏÌööö‘ŒÞàܳ¶¯[\Z²´¯³µ¯’”tur¥¨ Ž‹ùùùÓÔÒŠŠˆtvsƒ}­°¨ÔÔÔÿÿÿ!ù, ©€_L„…}p†ŠN BrŠv OsŠ„D9f0…3˜1RFŠY826„wZ§lt†| + +%inh´¶¸cJ„/^=ÄÆÈPaA ,VuÕ×Ùgb7S&+- I{Q?æè yE.„K U;q„@÷ >¨\ùPèFè)xƈŠ$\Â#â0X*ýA "Žk4þ ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/nav_prev.gif gallery-1.5.2/images/icons/nav_prev.gif --- gallery-1.5.1/images/icons/nav_prev.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/nav_prev.gif 2005-12-09 00:32:42.000000000 +0100 @@ -0,0 +1,4 @@ +GIF89a æóôòýýýÖÖÖ÷øöïñîíîììíêëíéøøøö÷õãæáôõóôõôˆ‰‡×××××ÖîðíæèãJKHúúùVWTüüûª«¨ÅÇÃÿÿÿïðîìíëûûúþþþÏÑÌêìé««ªòóðÕÕÕFGDUVSòòòçèæüüüKLIíïìêêéèèèûûûðñîøùøyzwtvq¾À¼äæãÍÏË™›•¬­ª‰Šˆ’•¨©§ÜàÚåæãÕÖÕŽ‹kkiƒ„éêè[]YPQNhie¾À»fhd˜›•wxt¿Á¼ÑÑÑÍÍÍÒÓј™•PQM²µ®Þßܤ§Ÿ¿Â¼ÉÊÇwyu¤¦ [\Xèéç¹»¸\]ZkliŠÜàÙÐÒϬ¬«ÎÎÍÉÊƬ¯§ghe€‚}stp£¥¡ÑÒÐõöõ¢¥Ÿ»½¹‚„~£¥ åæ媪©ÎÏÌööö‘ŒÞàܳ¶¯[\Z²´¯³µ¯’”tur¥¨ Ž‹ùùùÓÔÒŠŠˆtvsƒ}­°¨ÔÔÔÿÿÿ!ù, ©€‚ƒƒp}„ƒL_ˆ‚sO vˆrB NˆFR13ƒ0f9›D„tlZw‚62§8Y‚Jc% + +hni¶¸º|aP=^ÆÈÊ/7bg, uV×ÙÛA‚.Ey -+&?Q{Iéë&SƒWT> @‚q;ªì°Q4P@81HÏ +2Âæ‚D<†Xd$h Œ>| ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/tree/joinbottom-left.gif gallery-1.5.2/images/icons/tree/joinbottom-left.gif --- gallery-1.5.1/images/icons/tree/joinbottom-left.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/tree/joinbottom-left.gif 2005-12-18 18:22:11.000000000 +0100 @@ -0,0 +1 @@ +GIF89a€ÿÿÿ!ù,ŒÉíœ4ÉŠáÍÜvº„ʸ}扦êÊR; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/tree/joinbottom-right.gif gallery-1.5.2/images/icons/tree/joinbottom-right.gif --- gallery-1.5.1/images/icons/tree/joinbottom-right.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/tree/joinbottom-right.gif 2005-12-18 18:22:11.000000000 +0100 @@ -0,0 +1 @@ +GIF89a€ÿÿÿ!ù,Œo€Ëí¯žœ.ÒK-ÞMóŸÊ(–à‰¦êʶN; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/tree/join-left.gif gallery-1.5.2/images/icons/tree/join-left.gif --- gallery-1.5.1/images/icons/tree/join-left.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/tree/join-left.gif 2005-12-18 18:22:11.000000000 +0100 @@ -0,0 +1 @@ +GIF89a€ÿÿÿ!ù,ŒÉíœ4ÉŠáÍÜvº„ʸ}]ifhZ­ìä¦; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/tree/join-right.gif gallery-1.5.2/images/icons/tree/join-right.gif --- gallery-1.5.1/images/icons/tree/join-right.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/tree/join-right.gif 2005-12-18 18:22:11.000000000 +0100 @@ -0,0 +1 @@ +GIF89a€ÿÿÿ!ù, Œo€Ëí¯žœ.ÒK-ÞMóŸÊ(– ä[ª^l;½pP; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/icons/unsortedList.gif gallery-1.5.2/images/icons/unsortedList.gif --- gallery-1.5.1/images/icons/unsortedList.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/icons/unsortedList.gif 2005-10-17 19:46:12.000000000 +0200 @@ -0,0 +1 @@ +GIF89a¢ÿÿÿÿÿÿ!ù,$HºÜÂI"X#ë¼À`(:ШT±m]j¾pi¢ØÊ)¬› ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/nav_dot_left.gif gallery-1.5.2/images/nav_dot_left.gif --- gallery-1.5.1/images/nav_dot_left.gif 2001-01-02 08:13:14.000000000 +0100 +++ gallery-1.5.2/images/nav_dot_left.gif 2005-12-09 00:32:41.000000000 +0100 @@ -1 +1,4 @@ -GIF89a ‘ÿÿÿÿÿÿ!ù, T„i§œxJNh/ÊXGZAQ#; \ Pas de fin de ligne à la fin du fichier. +GIF89a + æÂľçççûûûíîë³µ®ÒÕÐRSP}~{çè椦 òóñàãÞìîꃄ‚ŒŽ‰––•ÁÄÀ_`]vxsèêçããâìíêzzw­¯ª›œ˜ÍÏËÊËÊÜßÚòóðÔÔÔ”—åç㪫¨ghdàáÞÂÂÂçèåSTQùúùPQN´·°úúù¢¥ŸáãÞ³¶®…‡ƒóóóÛÜÙÐÑÍáäß±²±×ÚÓööõ|}z“•‘áãßvwuùùùQROÑÓÏ|~yâäáúûúXYVÒÓÑûûúèéçáâᢤŸôô󺼶óôòëìéîïìÿÿÿ!ùJ, + U€Jƒ„„,F‚…ƒ&7( Š*A +)„3GDƒ-I1+ 0  IIH<!$4>9@5ƒ?=" 2„6:Š'%Šƒ8Є; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/nav_dot_right.gif gallery-1.5.2/images/nav_dot_right.gif --- gallery-1.5.1/images/nav_dot_right.gif 2001-01-02 08:13:14.000000000 +0100 +++ gallery-1.5.2/images/nav_dot_right.gif 2005-12-09 00:32:41.000000000 +0100 @@ -1 +1,4 @@ -GIF89a ‘ÿÿÿÿÿÿ!ù, ”‡©lÜC 2iiÖ0N%"; \ Pas de fin de ligne à la fin du fichier. +GIF89a + æÂľçççûûûíîë³µ®ÒÕÐRSP}~{çè椦 òóñàãÞìîꃄ‚ŒŽ‰––•ÁÄÀ_`]vxsèêçããâìíêzzw­¯ª›œ˜ÍÏËÊËÊÜßÚòóðÔÔÔ”—åç㪫¨ghdàáÞÂÂÂçèåSTQùúùPQN´·°úúù¢¥ŸáãÞ³¶®…‡ƒóóóÛÜÙÐÑÍáäß±²±×ÚÓööõ|}z“•‘áãßvwuùùùQROÑÓÏ|~yâäáúûúXYVÒÓÑûûúèéçáâᢤŸôô󺼶óôòëìéîïìÿÿÿ!ùJ, + T€J‚ƒƒ„…F,‡ (7&„ ) +A*‚DG3 0 +1I-<HII ‚5@9>4$!ƒ2 "=?‡:6‡‚%'̃8; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/nav_first.gif gallery-1.5.2/images/nav_first.gif --- gallery-1.5.1/images/nav_first.gif 2001-01-06 07:08:18.000000000 +0100 +++ gallery-1.5.2/images/nav_first.gif 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -GIF89a ‘ÿÿÿÿÿÿ!ù, *”o¡ˆÁ߀{  i¶z¼q‘'€¡˜„æ‰b¤I¶,‹n‡ŽWÍ)| ); \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/nav_last.gif gallery-1.5.2/images/nav_last.gif --- gallery-1.5.1/images/nav_last.gif 2001-01-06 07:08:18.000000000 +0100 +++ gallery-1.5.2/images/nav_last.gif 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -GIF89a ‘ÿÿÿÿÿÿ!ù, -”§½¯Ü AHm¬¾iòF6.T©¡)ù‰îËĪùΤ˜J7?ž|; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/nav_next.gif gallery-1.5.2/images/nav_next.gif --- gallery-1.5.1/images/nav_next.gif 2001-01-06 07:08:18.000000000 +0100 +++ gallery-1.5.2/images/nav_next.gif 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -GIF89aH ‘ÿÿÿÿÿÿ!ù,H @”©+Á΢œt˜nݼŸ`_蕦’H*žî–ªFܾöär,ß~¦Ñ~D`¯‘«} Zs m(5Ñ¥²Q; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/nav_prev.gif gallery-1.5.2/images/nav_prev.gif --- gallery-1.5.1/images/nav_prev.gif 2001-01-06 07:08:18.000000000 +0100 +++ gallery-1.5.2/images/nav_prev.gif 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -GIF89aH ‘ÿÿÿÿÿÿ!ù,H >”©›Á΢œTØpÝœ _Ø•æñ  ž®™¶"+¿öË9y÷+«‰ñ|DA*t,*W¤Ñò)â] ÐáðU; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/red_trafficlight.gif gallery-1.5.2/images/red_trafficlight.gif --- gallery-1.5.1/images/red_trafficlight.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/red_trafficlight.gif 2005-10-20 15:37:00.000000000 +0200 @@ -0,0 +1,3 @@ +GIF89a ÷Ž¢È§ty}‚ž¼rŽ¦s|±ÂÌ$)NKJÔxxx”ªÔl‰§inrYWVm„‘|™ºpœ&½Ê£ÄQ`h¶¾Ñƒ¡Äl³ºÊnŸ/NU20. ƒ‡š¦j‰•J_ky~€l}‡-C@>USQSepLlvDEE,&$VUUXTRúX:<322“>Œ§µ8FNëïñáçëõ÷ø_x†ÿÿÿûûük‡–¼ÌÕš³ÀÌ×Þn‰˜ºÈÐÿ baaÿ––ÑÜâZro‹šgjlÿ€€s…¯ÄÑçíð÷øù,CJÿ··Xo|õ5;èíðÕàæ’ª¸³ÄÍÉÕÛÿUUÿ++Õßåýýþ0HQƒ©ˆŸ«x‰”ø\\qonnoo$ {šÃ}—³o’¤ "¥°ÁZr‚3CMG ©±À±¶½hff³ºÃŽ©ÓŠª¼`y…lu{\XRŸ¬³¸‹ ¿‡“ª}™Vhq@alOOOu‡TRNwˆe“{…‹J^p&'(AQ[€œ­z…3@F?al^~Ž¼¾Ék{„ì\\n†”nƒ‘ž·ÖEGH€ƒŠ“žqsv‰¨ËŠ¥Ïr«Ž­Þx•§š­Í 28:‘°Ñw–» u†\ >PU¤·Ëx•¨®¸Ñ›®Ôl‹˜tvx«·Óju|lr`im­·ÊpŽ«¨Ê’ªÏ—¬Ïr’¦€ ¶‡žªopqw‚‰v„3AH‚©2DOa ´ÄÌQQU„ Ê{Š’ÿÿÿ!ùÿ, ÿÿ H° Áƒ*\È°¡Á9"°HÄ"bÎÀEŽòIÌçhÑ@ˆlB²©(ð4 t‰AðA`¦D̤ s Q¦’vì@±RK0 ; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/images/yellow_trafficlight.gif gallery-1.5.2/images/yellow_trafficlight.gif --- gallery-1.5.1/images/yellow_trafficlight.gif 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/images/yellow_trafficlight.gif 2005-10-20 15:37:00.000000000 +0200 @@ -0,0 +1 @@ +GIF89a ÷€€€€€€€€€€€€ÀÜÀ¦Êð™Ä&ÿffÿ™™ÿÌÌS]T¥†³Ô¾Þ(V=„\j¦’ÀÌÌÿAkc¤Y„½§ÑÆÖóˆª3™ÿŽÍðÙîù$M 2lM¦ŒÀl³Ó›DY_}’À¸ÒkÑßœPPff3™™fÌÌ™ÿÿÖypªèÒXÿëÿðžnGšdÿfÿ™÷³WÿÌ3V5 nJ ¦~NÇŸmÿÌ™æææÙÙÙ¿¿¿¦¦¦™™™ŒŒŒfff@@@oŒœÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûð  ¤€€€ÿÿÿÿÿÿÿ!ùý, ´û H° Áƒ*\È°áÁ$ÿ"þKbPâ?ƒ%RñˆÇ#BÔARGHŽÿ>‚¤ØñH—+þÓ±oÍ![¾|91%Ì$I6€ìw„f½z6méçsgP)>½8sßÑš$©þ*4¢G A‡@dJ³fR“L¿rëuç†!Æ=kSÇÒ¨.ßÆí™.ÄUifeUïß~wžD<³äâÄ.[ÜHprÁŒ);Ü̹s¿€; \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/includes/add_photos/add_admin.inc gallery-1.5.2/includes/add_photos/add_admin.inc --- gallery-1.5.1/includes/add_photos/add_admin.inc 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/add_photos/add_admin.inc 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ - - -

    - -

    -'. _("the documentation page") .'' . - _(" on the Gallery web site."); -?> -

    diff -Naur gallery-1.5.1/includes/add_photos/add_applet.cfg gallery-1.5.2/includes/add_photos/add_applet.cfg --- gallery-1.5.1/includes/add_photos/add_applet.cfg 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/add_photos/add_applet.cfg 2006-01-06 07:31:35.000000000 +0100 @@ -1,7 +1,7 @@ diff -Naur gallery-1.5.1/includes/add_photos/add_applet.inc gallery-1.5.2/includes/add_photos/add_applet.inc --- gallery-1.5.1/includes/add_photos/add_applet.inc 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/add_photos/add_applet.inc 2006-01-06 07:31:35.000000000 +0100 @@ -1,7 +1,7 @@ diff -Naur gallery-1.5.1/includes/add_photos/add_applet_mini.cfg gallery-1.5.2/includes/add_photos/add_applet_mini.cfg --- gallery-1.5.1/includes/add_photos/add_applet_mini.cfg 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/add_photos/add_applet_mini.cfg 2006-01-06 07:31:35.000000000 +0100 @@ -1,7 +1,7 @@ diff -Naur gallery-1.5.1/includes/add_photos/add_applet_mini.inc gallery-1.5.2/includes/add_photos/add_applet_mini.inc --- gallery-1.5.1/includes/add_photos/add_applet_mini.inc 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/add_photos/add_applet_mini.inc 2006-01-06 07:31:35.000000000 +0100 @@ -1,7 +1,7 @@ diff -Naur gallery-1.5.1/includes/add_photos/add_form.inc gallery-1.5.2/includes/add_photos/add_form.inc --- gallery-1.5.1/includes/add_photos/add_form.inc 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/add_photos/add_form.inc 2006-01-08 21:07:17.000000000 +0100 @@ -1,7 +1,7 @@ "; -echo _("Click the Browse button to locate a photo to upload."); -echo '
    '; -echo _("Supported file types") ?>: '; - -if ($gallery->app->feature["zip"] || $gallery->app->rar) { - echo '

    '. _("Tip:") . ' '; - echo _("Upload a compressed file (zip, rar, ace ...) full of photos and movies!"); - echo "

    \n\t"; +echo "\n

    ". _("Click the Browse button to locate a photo to upload."); +echo '
    '. _("After you added a file, you can add more files on the sane way, just use the browse button as often as you want."); +echo '
    '. _("Its possible to enter a manual caption for each item you upload, or you can gallery set the captions."); +echo '
    '. sprintf(_("Supported file types: %s"),join(", ", acceptableFormatList())); + +if (isset($gallery->app->feature["zip"]) || isset($gallery->app->rar)) { + $ftype = ''; + if(isset($gallery->app->feature["zip"])) { + $ftype .= "zip"; + } + if(isset($gallery->app->rar)) { + $ftype .= ($ftype) ? _(" or " ) : ''; + $ftype .= ("rar"); + } + echo "\n

    ". sprintf(_("You can also upload compressed archive files (%s) full of photos and movies!"), $ftype); } -echo makeFormIntro("add_photos.php", array("name" => "count_form", "method" => "POST"), array('type' => 'popup')); ?> - +echo "

    \n"; - - - - - - - - - -
    '. _("Optional:") .' '; -echo _("Select the number of meta data files you want to upload:"); +echo makeFormIntro("save_photos.php", + array("name" => "upload_form","enctype" => "multipart/form-data"), + array('type' => 'popup')); + +echo "\n"; +echo "\n
    ". _("Use the Browse button to find the photos on your computer"); +echo "\n

    ". _("Files:"); ?> -
    - - - - "upload_form", - "enctype" => "multipart/form-data", - "method" => "POST"), array('type' => 'popup')); ?> - - - - - - - - - - - - - -0) { - echo ''; - for ($i = 0; $i < $metaboxes; $i++) { - echo "\n"; - echo "\n\t'; - echo "\n\t'; - echo "\n"; - } - } + +
    + + +

    +

    + -


    ' . _("3. Use the Browse button to find the meta data files on your computer") . '
    " . _("File") .'". '

    +
    +
    + +
    "; - include(dirname(__FILE__) .'/captionOptions.inc.php'); - -if (isset($gallery->app->watermarkDir)) { - global $watermarkForm; - $watermarkForm["askRecursive"] = 0; - $watermarkForm["askPreview"] = 0; - $watermarkForm["allowNone"] = 1; - includeLayout('watermarkform.inc'); + echo _("If no caption is set, what would you like the captions to default to?"); + echo "\n

    "; + include(dirname(__FILE__) .'/captionOptions.inc.php'); + + if (isset($gallery->app->watermarkDir)) { + global $watermarkForm; + $watermarkForm["askRecursive"] = 0; + $watermarkForm["askPreview"] = 0; + $watermarkForm["allowNone"] = 1; + includeLayout('watermarkform.inc'); } ?>

    diff -Naur gallery-1.5.1/includes/add_photos/add_other.inc gallery-1.5.2/includes/add_photos/add_other.inc --- gallery-1.5.1/includes/add_photos/add_other.inc 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/add_photos/add_other.inc 2006-01-06 07:31:35.000000000 +0100 @@ -1,7 +1,7 @@

    diff -Naur gallery-1.5.1/includes/add_photos/add_url.inc gallery-1.5.2/includes/add_photos/add_url.inc --- gallery-1.5.1/includes/add_photos/add_url.inc 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/add_photos/add_url.inc 2006-01-06 07:31:35.000000000 +0100 @@ -1,7 +1,7 @@ - -

    "; + echo _("Upload any images found at this location.") . ' '; echo _("The location can either be a URL or a local directory on the server."); -?> -
    -'. _("Tip:") . ' '; + echo "\n

    \n"; + + echo ''. _("Tip:") . ' '; echo _("FTP images to a directory on your server then provide that path here!"); -?> -

    - "uploadurl_form", - "method" => "POST"), array('type' => 'popup')); + array('name' => 'uploadurl_form'), + array('type' => 'popup')); ?>

    diff -Naur gallery-1.5.1/includes/add_photos/captionOptions.inc.php gallery-1.5.2/includes/add_photos/captionOptions.inc.php --- gallery-1.5.1/includes/add_photos/captionOptions.inc.php 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/add_photos/captionOptions.inc.php 2006-01-06 07:31:35.000000000 +0100 @@ -1,7 +1,7 @@ - +
    - +
    - +
    app->use_exif)) { echo ''; echo ''; } echo "\n

    "; -echo _("For the last two options Gallery will use the format you specified in the config for date/time strings."); +echo gTranslate('core', "For the last two options Gallery will use the format you specified in the config for date/time strings."); ?> diff -Naur gallery-1.5.1/includes/definitions/albumProperties.php gallery-1.5.2/includes/definitions/albumProperties.php --- gallery-1.5.1/includes/definitions/albumProperties.php 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/definitions/albumProperties.php 2006-01-06 07:31:36.000000000 +0100 @@ -1,482 +1,491 @@ 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'] : '' + 'group_text_start' => array ( + 'type' => "group_start", + 'name' => "group_text", + 'default' => "inline", + 'title' => gTranslate('common', "Texts"), + 'contains_required' => false, + ), + 'summary' => array( + 'prompt' => gTranslate('common', "Album Summary"), + 'desc' => '', + 'value' => $gallery->album->fields["summary"], + 'type' => "textarea", + 'attrs' => array('cols' => 40, 'rows' => 6) + ), + 'title' => array( + 'prompt' => gTranslate('common', "Album Title"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["title"], + 'attrs' => array('size' => 50) + ), + 'group_text_end' => array ( + 'type' => "group_end", + ), + 'group_layout_start' => array ( + 'type' => "group_start", + 'name' => "group_layout", + 'default' => "none", + 'title' => gTranslate('common', "Layout"), + 'desc' => "" + ), + 'background' => array( + 'prompt' => gTranslate('common', "Background Image (URL)"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["background"] + ), + 'font' => array( + 'prompt' => gTranslate('common', "Font"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["font"] + ), + 'rows' => array( + 'prompt' => gTranslate('common', "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' => gTranslate('common', "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' => gTranslate('common', "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' => gTranslate('common', "Colors") + ), + 'bgcolor' => array( + 'prompt' => gTranslate('common', "Background Color"), + 'desc' => '', + 'type' => 'colorpicker', + 'value' => $gallery->album->fields["bgcolor"] + ), + 'textcolor' => array( + 'prompt' => gTranslate('common', "Text Color"), + 'desc' => '', + 'type' => 'colorpicker', + 'value' => $gallery->album->fields["textcolor"] + ), + 'linkcolor' => array( + 'prompt' => gTranslate('common', "Link Color"), + 'desc' => '', + 'type' => 'colorpicker', + 'value' => $gallery->album->fields["linkcolor"] + ), + 'bordercolor' => array( + 'prompt' => gTranslate('common', "Border Color"), + 'desc' => '', + 'type' => 'colorpicker', + 'value' => $gallery->album->fields["bordercolor"] + ), + 'subgroup_frams' => array ( + 'type' => "subgroup", + 'title' => gTranslate('common', "Frames") + ), + 'album_frame' => array( + 'prompt' => gTranslate('common', "Album Frame"), + 'desc' => '', + 'choices' => available_frames(), + 'value' => $gallery->album->fields["album_frame"] + ), + 'thumb_frame' => array( + 'prompt' => gTranslate('common', "Thumb Frame"), + 'desc' => '', + 'choices' => available_frames(), + 'value' => $gallery->album->fields["thumb_frame"] + ), + 'image_frame' => array( + 'prompt' => gTranslate('common', "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' => gTranslate('common', "Slideshow"), + 'desc' => "" + ), + 'slideshow_type' => array( + 'prompt' => gTranslate('common', "Slideshow Type"), + 'desc' => '', + 'choices' => array( "off" => gTranslate('common', "Off"), "ordered" => gTranslate('common', "Ordered"), "random" => gTranslate('common', "Random")), + 'value' => $gallery->album->fields["slideshow_type"] + ), + 'slideshow_recursive' => array( + 'prompt' => gTranslate('common', "Include sub-albums in slideshow"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["slideshow_recursive"] + ), + 'slideshow_loop' => array( + 'prompt' => gTranslate('common', "Allow slideshow to loop"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["slideshow_loop"] + ), + 'slideshow_length' => array( + 'prompt' => gTranslate('common', "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' => gTranslate('common', "Sizes"), + 'desc' => "" + ), + 'thumb_size' => array( + 'prompt' => gTranslate('common', "Thumbnail size"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["thumb_size"], + 'vartype' => 'int_notnull' + ), + 'thumb_ratio' => array( + 'prompt' => gTranslate('common', "The ratio in which the thumbnails are made.
    This affects only new thumbs. For existing use 'rebuild thumbs'"), + 'desc' => '', + 'choices' => array('0' => gTranslate('common', "As the original image"), '1/1' => gTranslate('common', "Square thumbs")), + 'value' => getPropertyDefault('thumb_ratio', $gallery->album, false), + ), + 'resize_size' => array( + 'prompt' => gTranslate('common', "Maximum dimensions of intermediate sized images"), + 'desc' => '', + 'choices' => array(0 => gTranslate('common', "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' => gTranslate('common', "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' => gTranslate('common', "Maximum dimensions of full sized images"), + 'desc' => '', + 'choices' => array(0 => gTranslate('common', "Off"), 400 => 400, 500 => 500, 600 => 600, 640 => 640, 700 => 700, 800 => 800, 1024 => 1024, 1280 => sprintf(gTranslate('common', '%d (%d MPix)'), 1280, 1), 1600 => sprintf(gTranslate('common', '%d (%d MPix)'), 1600, 2), 2048 => sprintf(gTranslate('common', '%d (%d MPix)'), 2048, 3)), + 'value' => $gallery->album->fields["max_size"], + 'vartype' => 'int_empty' + ), + 'max_file_size' => array( + 'prompt' => gTranslate('common', "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' => gTranslate('common', "Display"), + 'desc' => "" + ), + 'display_clicks' => array( + 'prompt' => gTranslate('common', "Display click counter for this album?"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["display_clicks"] + ), + 'item_owner_display' => array( + 'prompt' => gTranslate('common', "Display owners name with caption"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["item_owner_display"] + ), + 'showDimensions' => array( + 'prompt' => gTranslate('common', "Display clickable image dimensions"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["showDimensions"] + ), + 'use_exif' => array( + 'prompt' => gTranslate('common', "Display EXIF data?"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "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' => gTranslate('common', "Services"), + 'desc' => "" + ), + 'print_photos' => array( + 'prompt' => gTranslate('common', "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' ), - '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" + 'value' => $gallery->album->fields['print_photos'] + ), + 'ecards' => array( + 'prompt' => gTranslate('common', "Enable Ecards ?"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "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' => gTranslate('common', "Poll Properties"), + 'desc' => "" + ), + 'voter_class' => array( + 'prompt' => gTranslate('common', "Who can vote?"), + 'desc' => gTranslate('common', "This enables/disable voting and if enabled it controlles who can vote."), + 'choices' => array("Logged in" => gTranslate('common', "Logged in"), "Everybody" => gTranslate('common', "Everybody"), "Nobody" => gTranslate('common', "Nobody")), + 'value' => $gallery->album->fields["voter_class"] + ), + 'poll_type' => array( + 'prompt' => gTranslate('common', "Type of poll for this album"), + 'desc' => '', + 'choices' => array("rank" => gTranslate('common', "Rank"), "critique" => gTranslate('common', "Critique")), + 'value' => $gallery->album->fields["poll_type"] + ), + 'poll_scale' => array( + 'prompt' => gTranslate('common', "Number of voting options"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->getPollScale(), + 'vartype' => 'int_empty' + ), + 'poll_show_results' => array( + 'prompt' => gTranslate('common', "Show results of voting to all visitors?"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["poll_show_results"] + ), + 'poll_num_results' => array( + 'prompt' => gTranslate('common', "Number of lines of results graph to display on the album page"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->getPollNumResults(), + 'vartype' => 'int_empty' + ), + 'poll_orientation' => array( + 'prompt' => gTranslate('common', "Orientation of vote choices"), + 'desc' => '', + 'choices' => array('horizontal' => gTranslate('common', "Horizontal"), 'vertical' => gTranslate('common', "Vertical")), + 'value' => isset($gallery->album->fields['poll_orientation']) ? + $gallery->album->fields['poll_orientation'] : '' ), - '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), - ) - ); + 'poll_hint' => array( + 'prompt' => gTranslate('common', "Vote hint"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->getPollHint(), + 'attrs' => array('size' => 60) + ), + 'poll_displayed_values' => array( + 'prompt' => gTranslate('common', "Voting Options"), + 'desc' => '', + 'type' => 'table_values', + 'elements' => buildVotingInputFields(), + 'columns' => array(gTranslate('common', "Displayed Value"),gTranslate('common', "Points")), + 'value' => '' + ), + 'group_pollProperties_end' => array ( + 'type' => "group_end" + ), + 'group_misc_start' => array ( + 'type' => "group_start", + 'name' => "group_misc", + 'default' => "none", + 'title' => gTranslate('common', "Misc"), + 'desc' => "" + ), + 'add_to_beginning' => array( + 'prompt' => gTranslate('common', "Add new items at beginning of album"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["add_to_beginning"] + ), + 'returnto' => array( + 'prompt' => gTranslate('common', "Show Return to link"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["returnto"] + ), + 'use_fullOnly' => array( + 'prompt' => gTranslate('common', "Offer visitors ability to specify
    preference for full-size or resized images"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["use_fullOnly"] + ), + 'fit_to_window' => array( + 'prompt' => gTranslate('common', "Auto fit-to-window for
    images without a resized copy"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["fit_to_window"] + ), + 'subgroup_ermission' => array ( + 'type' => "subgroup", + 'title' => gTranslate('common', "Permissions") + ), + 'item_owner_modify' => array( + 'prompt' => gTranslate('common', "Allow item owners to modify their images"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No")), + 'value' => $gallery->album->fields["item_owner_modify"] + ), + 'item_owner_delete' => array( + 'prompt' => gTranslate('common', "Allow item owners to delete their images"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "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' => gTranslate('common', "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' => gTranslate('common', "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 ( +$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") + 'title' => gTranslate('common', "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"] + 'prompt' => gTranslate('common', "Use microthumb photo navigation"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "No"), "both" => gTranslate('common', "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"] + 'prompt' => gTranslate('common', "Microthumb style"), + 'desc' => '', + 'choices' => array("fixed" => gTranslate('common', "Fixed"), "dynamic" => gTranslate('common', "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"] + 'prompt' => gTranslate('common', "Show first & last microthumb"), + 'desc' => '', + 'choices' => array("yes" => gTranslate('common', "Yes"), "no" => gTranslate('common', "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"] + 'prompt' => gTranslate('common', "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"] + 'prompt' => gTranslate('common', "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"] + 'prompt' => gTranslate('common', "Position of microthumb navigation bar"), + 'desc' => '', + 'choices' => array("top" => gTranslate('common', "Top"), + "both" => gTranslate('common', "Both"), + "bottom" => gTranslate('common', "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) + 'prompt' => gTranslate('common', "Height of microthumbs 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) - ), + 'prompt' => gTranslate('common', "Bonus to height of current microthumb (pixels)"), + 'desc' => '', + 'type' => 'text', + 'value' => $gallery->album->fields["nav_thumbs_current_bonus"], + 'attrs' => array('size' => 3) + ), 'group_MicroThumbs_end' => array ( 'type' => "group_end" ), diff -Naur gallery-1.5.1/includes/definitions/mime.mapping.php gallery-1.5.2/includes/definitions/mime.mapping.php --- gallery-1.5.1/includes/definitions/mime.mapping.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/includes/definitions/mime.mapping.php 2005-10-11 19:38:29.000000000 +0200 @@ -0,0 +1,143 @@ +' where is the unknown file extension. + * + */ +$mime_extension_map = array( + 'arj' => 'application/x-arj', + 'asc' => 'text/plain', + 'avi' => 'video/x-msvideo', + 'bak' => 'application/x-trash', + 'bin' => 'application/octet-stream', + 'bmp' => 'image/bmp', + 'bz' => 'application/x-bzip', + 'bz2' => 'application/x-bzip', + 'csh' => 'application/x-shellscript', + 'css' => 'text/css', + 'cssl' => 'text/css', + 'csv' => 'text/x-comma-separated-values', + 'diff' => 'text/x-patch', + 'doc' => 'application/vnd.ms-word', + 'dtd' => 'text/x-dtd', + 'exe' => 'application/x-ms-dos-executable', + 'gif' => 'image/gif', + 'gtar' => 'application/x-gtar', + 'gz' => 'application/x-gzip', + 'htm' => 'text/html', + 'html' => 'text/html', + 'ics' => 'text/calendar', + 'ico' => 'image/x-ico', + 'iff' => 'image/x-iff', + 'iso' => 'application/x-cd-image', + 'jar' => 'application/x-jar', + 'jng' => 'image/x-jng', + 'jp2' => 'image/jpeg2000', + 'jpg' => 'image/jpeg', + 'jpe' => 'image/jpeg', + 'jpeg' => 'image/jpeg', + 'lha' => 'application/x-lha', + 'lhz' => 'application/x-lhz', + 'log' => 'text/x-log', + 'lzh' => 'application/x-lha', + 'lzo' => 'application/x-lzop', + 'moov' => 'video/quicktime', + 'mov' => 'video/quicktime', + 'movie' => 'video/x-sgi-movie', + 'mp2' => 'video/mpeg', + 'mp3' => 'audio/x-mp3', + 'mpe' => 'video/mpeg', + 'mpeg' => 'video/mpeg', + 'mpg' => 'video/mpeg', + 'mpga' => 'audio/mpeg', + 'nsv' => 'video/x-nsv', + 'ogg' => 'application/ogg', + 'pdf' => 'application/pdf', + 'pem' => 'application/x-x509-ca-cert', + 'perl' => 'application/x-perl', + 'pgp' => 'application/pgp', + 'php' => 'application/x-php', + 'php3' => 'application/x-php', + 'php4' => 'application/x-php', + 'pict' => 'image/x-pict', + 'pict1' => 'image/x-pict', + 'pict2' => 'image/x-pict', + 'pl' => 'application/x-perl', + 'pm' => 'application/x-perl', + 'png' => 'image/png', + 'po' => 'text/x-gettext-translation', + 'pot' => 'text/x-gettext-translation-template', + 'ppm' => 'image/x-portable-pixmap', + 'pps' => 'application/vnd.ms-powerpoint', + 'ppt' => 'application/vnd.ms-powerpoint', + 'ppz' => 'application/vnd.ms-powerpoint', + 'ps' => 'application/postscript', + 'ps.gz' => 'application/x-gzpostscript', + 'psd' => 'image/x-psd', + 'qt' => 'video/quicktime', + 'qtvr' => 'video/quicktime', + 'ra' => 'audio/x-pn-realaudio', + 'ram' => 'audio/x-pn-realaudio', + 'rar' => 'application/x-rar', + 'rm' => 'audio/x-pn-realaudio', + 'rpm' => 'application/x-rpm', + 'rss' => 'text/rss', + 'rtf' => 'application/rtf', + 'rtx' => 'text/richtext', + 'scm' => 'text/x-scheme', + 'sgm' => 'text/sgml', + 'sgml' => 'text/sgml', + 'sh' => 'application/x-shellscript', + 'shtml' => 'text/html', + 'sql' => 'text/x-sql', + 'sty' => 'text/x-tex', + 'svg' => 'image/svg+xml', + 'swf' => 'application/x-shockwave-flash', + 't' => 'application/x-troff', + 'tar' => 'application/x-tar', + 'tar.Z' => 'application/x-tarz', + 'tar.bz' => 'application/x-bzip-compressed-tar', + 'tar.bz2' => 'application/x-bzip-compressed-tar', + 'tar.gz' => 'application/x-compressed-tar', + 'tar.lzo' => 'application/x-tzo', + 'tcl' => 'text/x-tcl', + 'tex' => 'text/x-tex', + 'texi' => 'text/x-texinfo', + 'texinfo' => 'text/x-texinfo', + 'tgz' => 'application/x-compressed-tar', + 'theme' => 'application/x-theme', + 'tif' => 'image/tiff', + 'tiff' => 'image/tiff', + 'tk' => 'text/x-tcl', + 'torrent' => 'application/x-bittorrent', + 'ttf' => 'application/x-font-ttf', + 'txt' => 'text/plain', + 'uri' => 'text/x-uri', + 'url' => 'text/x-uri', + 'vcf' => 'text/x-vcalendar', + 'vcs' => 'text/x-vcalendar', + 'vct' => 'text/x-vcard', + 'vfb' => 'text/calendar', + 'vob' => 'video/mpeg', + 'wav' => 'audio/x-wav', + 'wmf' => 'image/x-wmf', + 'wml' => 'text/vnd.wap.wml', + 'xla' => 'application/vnd.ms-excel', + 'xlc' => 'application/vnd.ms-excel', + 'xld' => 'application/vnd.ms-excel', + 'xll' => 'application/vnd.ms-excel', + 'xlm' => 'application/vnd.ms-excel', + 'xls' => 'application/vnd.ms-excel', + 'xlt' => 'application/vnd.ms-excel', + 'xlw' => 'application/vnd.ms-excel', + 'xm' => 'audio/x-mod', + 'xmi' => 'text/x-xmi', + 'xml' => 'text/xml', + 'xul' => 'application/vnd.mozilla.xul+xml', + 'z' => 'application/x-compress', + 'zip' => 'application/zip', + 'zoo' => 'application/x-zoo', +); \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/includes/definitions/navIcons.php gallery-1.5.2/includes/definitions/navIcons.php --- gallery-1.5.1/includes/definitions/navIcons.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/includes/definitions/navIcons.php 2005-12-09 00:32:40.000000000 +0100 @@ -0,0 +1,15 @@ + +direction == "ltr") { + $fpImgUrl= getImagePath('icons/nav_first.gif'); + $ppImgUrl= getImagePath('icons/nav_prev.gif'); + $npImgUrl= getImagePath('icons/nav_next.gif'); + $lpImgUrl= getImagePath('icons/nav_last.gif'); +} else { + $fpImgUrl= getImagePath('icons/nav_last.gif'); + $ppImgUrl= getImagePath('icons/nav_next.gif'); + $npImgUrl= getImagePath('icons/nav_prev.gif'); + $lpImgUrl= getImagePath('icons/nav_first.gif'); +} +?> \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/includes/definitions/services.php gallery-1.5.2/includes/definitions/services.php --- gallery-1.5.1/includes/definitions/services.php 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/definitions/services.php 2006-01-06 07:31:36.000000000 +0100 @@ -1,7 +1,7 @@ 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.") + 'description' => gTranslate('common', "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.1/includes/slideshow/applet.cfg gallery-1.5.2/includes/slideshow/applet.cfg --- gallery-1.5.1/includes/slideshow/applet.cfg 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/slideshow/applet.cfg 2006-01-06 07:31:36.000000000 +0100 @@ -1,7 +1,7 @@ diff -Naur gallery-1.5.1/includes/slideshow/applet.inc gallery-1.5.2/includes/slideshow/applet.inc --- gallery-1.5.1/includes/slideshow/applet.inc 2005-09-13 00:40:46.000000000 +0200 +++ gallery-1.5.2/includes/slideshow/applet.inc 2006-01-06 07:31:36.000000000 +0100 @@ -1,7 +1,7 @@ @@ -104,11 +104,12 @@ /* 'svo' => array('type' => 'checkbox', 'default' => '', 'text' => _("Show the number of 'simplified' votes an image has")), -*/ 'sav' => array('type' => 'checkbox', 'default' => '', 'text' => _("Show the add vote link")), +*/ 'sao' => array('type' => 'checkbox', + 'default' => '', 'text' => _("Show the album owners")), 'stm' => array('type' => 'checkbox', diff -Naur gallery-1.5.1/index.php gallery-1.5.2/index.php --- gallery-1.5.1/index.php 2005-09-13 00:40:44.000000000 +0200 +++ gallery-1.5.2/index.php 2006-01-06 07:31:30.000000000 +0100 @@ -1,7 +1,7 @@ PRODUCT) && + $GLOBALS['_VERSION']->PRODUCT == 'Joomla!') { + $GALLERY_EMBEDDED_INSIDE = 'joomla'; + $GALLERY_EMBEDDED_INSIDE_TYPE = 'joomla'; + } } elseif (isset($GLOBALS['phpbb_root_path'])) { $GALLERY_EMBEDDED_INSIDE='phpBB2'; @@ -104,6 +110,7 @@ "add_photos.php", "add_photos_frame.php", "admin-page.php", + "administer_startpage.php", "album_permissions.php", "albums.php", "block-random.php", @@ -114,6 +121,7 @@ "delete_photo.php", "delete_user.php", "do_command.php", + "download.php", "ecard_form.php", "edit_appearance.php", "edit_caption.php", @@ -123,7 +131,10 @@ "extra_fields.php", "gallery_remote.php", "gallery_remote2.php", + "help/imagemap.php", + "help/metadataOnUpload.php", "highlight_photo.php", + "imagemap.php", "lib/colorpicker.php", "login.php", "manage_users.php", diff -Naur gallery-1.5.1/init.php gallery-1.5.2/init.php --- gallery-1.5.1/init.php 2005-09-13 00:40:44.000000000 +0200 +++ gallery-1.5.2/init.php 2006-01-06 07:31:30.000000000 +0100 @@ -1,29 +1,29 @@ app->timeLimit); } /* -* We TRY to make sure that register_globals is disabled. If the user has not disabled -* register_globals in their php.ini, we try to emulate its functionality by unsetting all -* variables from $_REQUEST. Some *Nuke systems apparently do not function well with this -* emulation, so we have given users a method to opt-out. -* -* WE DO NOT OFFICIALLY SUPPORT THE USE OF skipRegisterGlobals BECAUSE IT COULD POTENTIALLY -* OPEN Gallery TO SECURITY RISKS! This is for advanced users only. + * We TRY to make sure that register_globals is disabled. If the user has not disabled + * register_globals in their php.ini, we try to emulate its functionality by unsetting all + * variables from $_REQUEST. Some *Nuke systems apparently do not function well with this + * emulation, so we have given users a method to opt-out. + * + * WE DO NOT OFFICIALLY SUPPORT THE USE OF skipRegisterGlobals BECAUSE IT COULD POTENTIALLY + * OPEN Gallery TO SECURITY RISKS! This is for advanced users only. */ if (empty($gallery->app->skipRegisterGlobals) || $gallery->app->skipRegisterGlobals != "yes") { $register_globals = @ini_get('register_globals'); @@ -93,13 +93,13 @@ } /* -** Now we can catch if were are in GeekLog -** We also include the common lib file as we need it in initLanguage() + * Now we can catch if were are in GeekLog + * We also include the common lib file as we need it in initLanguage() + * + * If the old example path is still set, remove it. */ - -// If the old example path is still set, remove it. if (!empty($gallery->app->geeklog_dir) && $gallery->app->geeklog_dir == "/path/to/geeklog/public_html") { - $gallery->app->geeklog_dir = ""; + $gallery->app->geeklog_dir = ''; } // Verify that the geeklog_dir isn't overwritten with a remote exploit @@ -117,8 +117,7 @@ require_once(GEEKLOG_DIR . '/lib-common.php'); } -if (isset($gallery->app->devMode) && -$gallery->app->devMode == "yes") { +if (isset($gallery->app->devMode) && $gallery->app->devMode == 'yes') { ini_set("display_errors", "1"); error_reporting(E_ALL); } else { @@ -126,23 +125,23 @@ } /* -* Detect if we're running under SSL and adjust the URL accordingly. + * Detect if we're running under SSL and adjust the URL accordingly. */ if(isset($gallery->app)) { if (isset($_SERVER["HTTPS"] ) && stristr($_SERVER["HTTPS"], "on")) { $gallery->app->photoAlbumURL = - eregi_replace("^http:", "https:", $gallery->app->photoAlbumURL); + eregi_replace("^http:", "https:", $gallery->app->photoAlbumURL); $gallery->app->albumDirURL = - eregi_replace("^http:", "https:", $gallery->app->albumDirURL); + eregi_replace("^http:", "https:", $gallery->app->albumDirURL); } else { $gallery->app->photoAlbumURL = - eregi_replace("^https:", "http:", $gallery->app->photoAlbumURL); + eregi_replace("^https:", "http:", $gallery->app->photoAlbumURL); $gallery->app->albumDirURL = - eregi_replace("^https:", "http:", $gallery->app->albumDirURL); + eregi_replace("^https:", "http:", $gallery->app->albumDirURL); } /* - * We have a Coral (http://www.scs.cs.nyu.edu/coral/) request coming in, adjust outbound links + * We have a Coral (http://www.scs.cs.nyu.edu/coral/) request coming in, adjust outbound links */ if(isset($_SERVER['HTTP_USER_AGENT']) && strstr($_SERVER['HTTP_USER_AGENT'], 'CoralWebPrx')) { if (ereg("^(http://[^:]+):(\d+)(.*)$", $gallery->app->photoAlbumURL)) { @@ -158,15 +157,14 @@ } /* -* Turn off magic quotes runtime as they interfere with saving and -* restoring data from our file-based database files + * Turn off magic quotes runtime as they interfere with saving and + * restoring data from our file-based database files */ set_magic_quotes_runtime(0); /* Load classes and session information -** Note: Some classes and libs are loaded in util.php + * Note: Some classes and libs are loaded in util.php */ - require(dirname(__FILE__) . "/classes/Album.php"); require(dirname(__FILE__) . "/classes/Image.php"); require(dirname(__FILE__) . "/classes/AlbumItem.php"); @@ -204,7 +202,7 @@ /* pre 0.7.1 */ include_once(dirname(__FILE__) . "/classes/postnuke/UserDB.php"); include_once(dirname(__FILE__) . "/classes/postnuke/User.php"); - + $gallery->database{"db"} = $GLOBALS['dbconn']; $gallery->database{"prefix"} = $GLOBALS['pnconfig']['prefix'] . "_"; } @@ -213,14 +211,14 @@ include_once(dirname(__FILE__) . "/classes/postnuke0.7.1/UserDB.php"); include_once(dirname(__FILE__) . "/classes/postnuke0.7.1/User.php"); } - + /* Load our user database (and user object) */ $gallery->userDB = new PostNuke_UserDB; - + if (isset($GLOBALS['user'])) { $gallery->session->username = $GLOBALS['user']; } - + if (isset($GLOBALS['user']) && is_user($GLOBALS['user'])) { $user_info = getusrinfo($GLOBALS['user']); $gallery->session->username = $user_info["uname"]; @@ -233,13 +231,13 @@ include_once(dirname(__FILE__) . "/classes/database/mysql/Database.php"); include_once(dirname(__FILE__) . "/classes/nuke5/UserDB.php"); include_once(dirname(__FILE__) . "/classes/nuke5/User.php"); - + $gallery->database{"nuke"} = new MySQL_Database( - $GLOBALS['dbhost'], - $GLOBALS['dbuname'], - $GLOBALS['dbpass'], - $GLOBALS['dbname']); - + $GLOBALS['dbhost'], + $GLOBALS['dbuname'], + $GLOBALS['dbpass'], + $GLOBALS['dbname']); + if (isset($GLOBALS['user_prefix'])) { $gallery->database{"user_prefix"} = $GLOBALS['user_prefix'] . '_'; } @@ -247,33 +245,33 @@ $gallery->database{"user_prefix"} = 'nuke_'; } $gallery->database{"prefix"} = $GLOBALS['prefix'] . '_'; - + /* PHP-Nuke changed its "users" table field names in v.6.5 */ /* Select the appropriate field names */ if (isset($Version_Num) && $Version_Num >= "6.5") { $gallery->database{'fields'} = array ( - 'name' => 'name', - 'uname' => 'username', - 'email' => 'user_email', - 'uid' => 'user_id'); + 'name' => 'name', + 'uname' => 'username', + 'email' => 'user_email', + 'uid' => 'user_id'); } else { $gallery->database{'fields'} = array ( - 'name' => 'name', - 'uname' => 'uname', - 'email' => 'email', - 'uid' => 'uid'); + 'name' => 'name', + 'uname' => 'uname', + 'email' => 'email', + 'uid' => 'uid'); } - + /* Load our user database (and user object) */ $gallery->userDB = new Nuke5_UserDB; if ($GLOBALS['user']) { $gallery->session->username = $GLOBALS['user']; } - + if (isset($GLOBALS['admin']) && is_admin($GLOBALS['admin'])) { include_once(dirname(__FILE__) . "/classes/nuke5/AdminUser.php"); - + $gallery->user = new Nuke5_AdminUser($GLOBALS['admin']); $gallery->session->username = $gallery->user->getUsername(); } @@ -283,19 +281,19 @@ $gallery->user = $gallery->userDB->getUserByUsername($gallery->session->username); } break; - case 'nsnnuke': + case 'nsnnuke': /* we're in nsnnuke */ include_once(dirname(__FILE__) . "/classes/Database.php"); include_once(dirname(__FILE__) . "/classes/database/mysql/Database.php"); include_once(dirname(__FILE__) . "/classes/nsnnuke/UserDB.php"); include_once(dirname(__FILE__) . "/classes/nsnnuke/User.php"); - + $gallery->database{"nsnnuke"} = new MySQL_Database( - $GLOBALS['dbhost'], - $GLOBALS['dbuname'], - $GLOBALS['dbpass'], - $GLOBALS['dbname']); - + $GLOBALS['dbhost'], + $GLOBALS['dbuname'], + $GLOBALS['dbpass'], + $GLOBALS['dbname']); + if (isset($GLOBALS['user_prefix'])) { $gallery->database{"user_prefix"} = $GLOBALS['user_prefix'] . '_'; } @@ -304,23 +302,23 @@ } $gallery->database{"prefix"} = $GLOBALS['prefix'] . '_'; $gallery->database{"admin_prefix"} = $GLOBALS['prefix'] . 'b_'; - + /* Select the appropriate field names */ $gallery->database{'fields'} = array ( - 'name' => 'realname', - 'uname' => 'username', - 'email' => 'user_email', - 'uid' => 'user_id'); - + 'name' => 'realname', + 'uname' => 'username', + 'email' => 'user_email', + 'uid' => 'user_id'); + /* Load our user database (and user object) */ $gallery->userDB = new NsnNuke_UserDB; if ($GLOBALS['user']) { $gallery->session->username = $GLOBALS['user']; } - + if (isset($GLOBALS['admin']) && is_admin($GLOBALS['admin'])) { include_once(dirname(__FILE__) . "/classes/nsnnuke/AdminUser.php"); - + $gallery->user = new NsnNuke_AdminUser($GLOBALS['admin']); $gallery->session->username = $gallery->user->getUsername(); } @@ -331,16 +329,28 @@ } break; case 'phpBB2': + //print_r($GLOBALS['board_config']['version']); include_once(dirname(__FILE__) . "/classes/Database.php"); include_once(dirname(__FILE__) . "/classes/database/mysql/Database.php"); include_once(dirname(__FILE__) . "/classes/phpbb/UserDB.php"); include_once(dirname(__FILE__) . "/classes/phpbb/User.php"); - $gallery->database{"phpbb"} = new MySQL_Database( - $GLOBALS['dbhost'], - $GLOBALS['dbuser'], - $GLOBALS['dbpasswd'], - $GLOBALS['dbname']); -// $gallery->database{"phpbb"}->setTablePrefix($GLOBALS['table_prefix']); + + if(!isset($GLOBALS['board_config']['version']) || + $GLOBALS['board_config']['version'] < '.0.17' ) { + $dbhost = $GLOBALS['dbhost']; + $dbuser = $GLOBALS['dbuser']; + $dbpasswd = $GLOBALS['dbpasswd']; + $dbname = $GLOBALS['dbname']; + } else { + $dbhost = $GLOBALS['db']->server; + $dbuser = $GLOBALS['db']->user; + $dbpasswd = $GLOBALS['db']->password; + $dbname = $GLOBALS['db']->dbname; + } + + $gallery->database{"phpbb"} = new MySQL_Database($dbhost, $dbuser, $dbpasswd, $dbname); + + // $gallery->database{"phpbb"}->setTablePrefix($GLOBALS['table_prefix']); $gallery->database{"prefix"} = $GLOBALS['table_prefix']; /* Load our user database (and user object) */ $gallery->userDB = new phpbb_UserDB; @@ -353,11 +363,12 @@ } break; case 'mambo': + case 'joomla': include_once(dirname(__FILE__) . '/classes/Database.php'); include_once(dirname(__FILE__) . '/classes/database/mysql/Database.php'); include_once(dirname(__FILE__) . '/classes/mambo/UserDB.php'); include_once(dirname(__FILE__) . '/classes/mambo/User.php'); - + global $mosConfig_host; global $mosConfig_user; global $mosConfig_password; @@ -365,7 +376,7 @@ global $mosConfig_dbprefix; global $mosConfig_lang; global $my; - + /* Session info about Mambo are available when we open a Popup from Mambo, ** but content isnt parsed through Mambo */ @@ -393,23 +404,24 @@ echo 'init.php: ' . _("Gallery seems to be inside Mambo, but we couldn't get the necessary info."); exit; } - + $gallery->database{'mambo'} = new MySQL_Database($mosConfig_host, $mosConfig_user, $mosConfig_password, $mosConfig_db); $gallery->database{'user_prefix'} = $mosConfig_dbprefix; $gallery->database{'fields'} = - array ('name' => 'name', + array ( + 'name' => 'name', 'uname' => 'username', 'email' => 'email', 'uid' => 'id', 'gid' => 'gid'); - + $gallery->userDB = new Mambo_UserDB; - + /* Check if user is logged in, else explicit log him/her out */ if (!empty($my->username)) { $gallery->session->username = $my->username; $gallery->user = $gallery->userDB->getUserByUsername($gallery->session->username); - + /* We were loaded correctly through Mambo, so we dont need/want "old" session infos */ } elseif (!empty($gallery->session->username) && empty($my)) { /* This happens, when we are in a Popup */ @@ -419,10 +431,11 @@ unset($gallery->session->username); unset($gallery->session->language); } - + /* For proper Mambo breadcrumb functionality, we need - * to know the Item ID of the Gallery component's menu - * item. +2 DB calls. */ + * to know the Item ID of the Gallery component's menu + * item. +2 DB calls. + */ $db = $gallery->database{'mambo'}; $results = $db->query('SELECT id FROM ' . $gallery->database{'user_prefix'} . "components WHERE link='option=$GALLERY_MODULENAME'"); $row = $db->fetch_row($results); @@ -431,12 +444,12 @@ $row = $db->fetch_row($results); $MOS_GALLERY_PARAMS['itemid'] = $row[0]; // pick the first one break; - case 'GeekLog': + case 'GeekLog': // Cheat, and grab USER information from the global session variables. // Hey, it's faster and easier than reading them out of the database. - + global $_USER; - + /* Check if user is logged in, else explicit log him/her out */ if (isset($_USER["username"])) { $gallery->session->username = $_USER['username']; @@ -444,15 +457,15 @@ unset($gallery->session->username); unset($gallery->session->language); } - + /* Implement GeekLogUserDB and User class. */ require(dirname(__FILE__) . "/classes/geeklog/UserDB.php"); require(dirname(__FILE__) . "/classes/geeklog/User.php"); - + /* Load GeekLog user database (and user object) */ - + $gallery->userDB = new Geeklog_UserDB; - + /* Load their user object with their username as the key */ if (isset($gallery->session->username)) { $gallery->user = $gallery->userDB->getUserByUsername($gallery->session->username); @@ -464,13 +477,13 @@ include_once(dirname(__FILE__) . "/classes/database/mysql/Database.php"); include_once(dirname(__FILE__) . "/classes/nsnnuke/UserDB.php"); include_once(dirname(__FILE__) . "/classes/nsnnuke/User.php"); - + $gallery->database{"cpgnuke"} = new MySQL_Database( $GLOBALS['dbhost'], $GLOBALS['dbuname'], $GLOBALS['dbpass'], $GLOBALS['dbname']); - + if (isset($GLOBALS['user_prefix'])) { $gallery->database{"user_prefix"} = $GLOBALS['prefix'] . '_'; } @@ -479,28 +492,28 @@ } $gallery->database{"prefix"} = $GLOBALS['prefix'] . '_'; $gallery->database{"admin_prefix"} = $GLOBALS['prefix'] . 'b_'; - + /* Select the appropriate field names */ $gallery->database{'fields'} = - array ('name' => 'name', - 'uname' => 'username', - 'email' => 'user_email', - 'uid' => 'user_id'); - + array ( + 'name' => 'name', + 'uname' => 'username', + 'email' => 'user_email', + 'uid' => 'user_id'); + /* Load our user database (and user object) */ $gallery->userDB = new CPGNuke_UserDB; if (is_user()) { $gallery->session->username = $userinfo['username']; $gallery->user = $gallery->userDB->getUserByUsername($gallery->session->username); } - + if (is_admin()) { include_once(dirname(__FILE__) . "/classes/nsnnuke/AdminUser.php"); - + $gallery->user = new CPGNuke_AdminUser(); $gallery->session->username = $gallery->user->getUsername(); } - break; } } @@ -528,7 +541,7 @@ } /* Now we init the language -** Its done after initializing the user. + * Its done after initializing the user. */ initLanguage(); diff -Naur gallery-1.5.1/js/fitToWindow.js.php gallery-1.5.2/js/fitToWindow.js.php --- gallery-1.5.1/js/fitToWindow.js.php 2005-06-21 12:11:46.000000000 +0200 +++ gallery-1.5.2/js/fitToWindow.js.php 2006-01-18 19:06:05.000000000 +0100 @@ -5,49 +5,45 @@ ** These values define the margin between your image and the navigation and or a left block. ** Change to your suites. */ - var marginLeft = 100; - var marginTop = 275; + var marginLeft = 100; + var marginTop = 275; /* ** Dont touch ** Here are the dimensions of the original image */ - var imagewidth = ; - var imageheight = ; - var imageratio = imagewidth/imageheight; + var imagewidth = ; + var imageheight = ; + var imageratio = imagewidth/imageheight; /* ** Get the window width. NS and IE use different methods */ - -function windowWidth() -{ - if (window.innerWidth) { +function windowWidth() { + if (window.innerWidth) { return window.innerWidth; - } - else if (document.body && document.body.offsetWidth) { - return document.body.offsetWidth; - } - else { - return 0; - } + } + else if (document.documentElement.clientWidth) { + return document.documentElement.clientWidth; + } + else { + return document.body.clientWidth; + } } /* ** Get the window height. NS and IE use different methods */ - -function windowHeight() -{ - if (window.innerHeight) { +function windowHeight() { + if (window.innerHeight) { return window.innerHeight; - } - else if (document.body && document.body.offsetHeight) { - return document.body.offsetHeight; - } - else { - return 0; - } + } + else if (document.documentElement.clientHeight) { + return document.documentElement.clientHeight; + } + else { + return document.body.clientHeight; + } } /* @@ -55,7 +51,6 @@ ** save the windowdimensions. */ function calculateNewSize(){ - windowWidth = windowWidth(); windowHeight= windowHeight(); @@ -64,41 +59,40 @@ if ( imagewidth > (windowWidth - marginLeft)) { newwidth = windowWidth - marginLeft; - newheight = newwidth / imageratio; + newheight = parseInt(newwidth / imageratio); } if ( newheight > (windowHeight - marginTop)) { newheight = windowHeight - marginTop; - newwidth = newheight * imageratio; + newwidth = parseInt( newheight * imageratio); } setReducedSize(); } function setReducedSize() { - document.photo_j.height = newheight; - document.photo_j.width = newwidth; - if (document.frameRR) { - document.frameRR.height = newheight; - document.frameLL.height = newheight; - } + document.getElementById('galleryImage').height = newheight; + document.getElementById('galleryImage').width = newwidth; + if (document.getElementsByName('frameRR')) { + document.getElementsByName('frameRR').height = newheight; + document.getElementsByName('frameLL').height = newheight; + } } function sizeChange() { + this.full = false; - this.full = false; - - this.toggle = function toggle() { - if (this.full == true) { - this.full = false; - setReducedSize(); - } else { - document.photo_j.height = imageheight; - document.photo_j.width = imagewidth; + this.toggle = function toggle() { + if (this.full == true) { + this.full = false; + setReducedSize(); + } else { + document.getElementById('galleryImage').height = imageheight; + document.getElementById('galleryImage').width = imagewidth; - this.full = true; - } + this.full = true; } + } } sizeChange = new sizeChange(); diff -Naur gallery-1.5.1/js/imagemap.js gallery-1.5.2/js/imagemap.js --- gallery-1.5.1/js/imagemap.js 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/js/imagemap.js 2005-12-09 15:59:12.000000000 +0100 @@ -0,0 +1,164 @@ + var minX; + var minY; + var width; + var height; + + var xVals = new Array(); + var yVals = new Array(); + var imgxVals = new Array(); + var imgyVals = new Array(); + + var jg; + function initPaintArea() { + jg = new jsGraphics("myCanvas"); + jg.setColor("#FFFFFF"); + + getMyPicCoords(); + /* Update map coords */ + for(i=0; i< map.length; ++i) { + for (j=0; j< map[i]['x_coords'].length; ++j) { + map[i]['x_coords'][j] = map[i]['x_coords'][j] + minX; + map[i]['y_coords'][j] = map[i]['y_coords'][j] + minY; + } + } + } + + + // find out if ie runs in quirks mode + var docEl = (typeof document.compatMode != "undefined" && document.compatMode != "BackCompat")? "documentElement" : "body"; + + // register event + // capture it for nc 4x (ok it's a dino) + function init_mousemove() { + if(document.layers) document.captureEvents(Event.MOUSEMOVE); + document.onmousemove = dpl_mouse_move; + document.onmousedown = dpl_mouse_click; + } + + function dpl_mouse_move(e) { + + // position where mousemove fired + // + var xPos = e? e.pageX : window.event.x; + var yPos = e? e.pageY : window.event.y; + + // for ie add scroll position + // + if (document.all && !document.captureEvents) { + xPos += document[docEl].scrollTop; + yPos += document[docEl].scrollTop; + } + + var imgPosX = xPos - minX; + var imgPosY = yPos - minY; + + el = document.getElementById('current_position'); + // display position + if(!(xPos < minX || yPos < minY || xPos > minX+width || yPos > minY+height)) { + el.style.backgroundColor='green'; + } else { + el.style.backgroundColor='red'; + imgPosX = 0; + imgPosY = 0; + } + + // display position + document.areas.ausg.value = "Left = " + xPos + " : Top = " + yPos; + + // for the dino pass event + if (document.layers) routeEvent(e); + } + + function dpl_mouse_click(e) { + getMyPicCoords(); + // position where mousemove fired + var xPos = e? e.pageX : window.event.x; + var yPos = e? e.pageY : window.event.y; + + // for ie add scroll position + // + if (document.all && !document.captureEvents) { + xPos += document[docEl].scrollTop; + yPos += document[docEl].scrollTop; + } + + if(xPos < minX || yPos < minY || xPos > minX+width || yPos > minY+height) { + // do nothing + } + else { + var imgPosX = xPos - minX; + var imgPosY = yPos - minY; + + imgxVals.push(imgPosX); + imgyVals.push(imgPosY); + xVals.push(xPos); + yVals.push(yPos); + document.areas.xvals.value = imgxVals; + document.areas.yvals.value = imgyVals; + // draw + + jg.clear(); + jg.drawPolygon(xVals, yVals); + jg.paint(); + } + + // for the dino pass event + if (document.layers) routeEvent(e); + + } + + function Int(d_x, d_y) { + return isNaN(d_y = parseInt(d_x))? 0 : d_y; + }; + + function getMyPicCoords() { + element = document.getElementById('myPic'); + + width = element.width; + height = element.height; + + minX = minY = 0; //global helper vars + while(element) { + minX += Int(element.offsetLeft); + minY += Int(element.offsetTop); + element = element.offsetParent || null; + } + }; + + + function resetAndClear() { + jg.clear(); + xVals = new Array(); + yVals = new Array(); + imgxVals = new Array(); + imgyVals = new Array(); + document.areas.xvals.value = xVals; + document.areas.yvals.value = yVals; + } + + function updatePictureAndArea () { + el = document.getElementById('imageareas'); + areaurl = document.getElementById('areaurl'); + areatext = document.getElementById('areatext'); + selected = 0; + count_selected = 0; + + jg.clear(); + for (i = 0; i < el.length; ++i) { + if (el.options[i].selected == true) { + area_index = el.options[i].value; + jg.drawPolygon(map[area_index]['x_coords'], map[area_index]['y_coords']); + selected = area_index; + count_selected++; + } + } + jg.paint(); + if (count_selected == 1) { + areaurl.value = map[selected]['url']; + areatext.value = map[selected]['hover_text']; + } + else { + areaurl.value = ''; + areatext.value = ''; + } + } diff -Naur gallery-1.5.1/js/multifile.js.php gallery-1.5.2/js/multifile.js.php --- gallery-1.5.1/js/multifile.js.php 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/js/multifile.js.php 2005-12-30 19:38:13.000000000 +0100 @@ -0,0 +1,162 @@ + \ Pas de fin de ligne à la fin du fichier. diff -Naur gallery-1.5.1/js/toggle.js gallery-1.5.2/js/toggle.js --- gallery-1.5.1/js/toggle.js 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/js/toggle.js 2005-10-20 15:41:06.000000000 +0200 @@ -0,0 +1,15 @@ +function gallery_toggle(id) { + var img; + var elem; + + img = document.getElementById('toogleBut_' + id); + elem = document.getElementById('toogleFrame_' + id); + + if (elem.style.display == 'none') { + elem.style.display = 'inline'; + img.src = '../images/collapse.gif'; + } else { + elem.style.display = 'none'; + img.src = '../images/expand.gif'; + } +} diff -Naur gallery-1.5.1/js/wz_jsgraphics.js gallery-1.5.2/js/wz_jsgraphics.js --- gallery-1.5.1/js/wz_jsgraphics.js 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/js/wz_jsgraphics.js 2005-11-21 22:06:24.000000000 +0100 @@ -0,0 +1,943 @@ +/* This notice must be untouched at all times. + +wz_jsgraphics.js v. 2.33 +The latest version is available at +http://www.walterzorn.com +or http://www.devira.com +or http://www.walterzorn.de + +Copyright (c) 2002-2004 Walter Zorn. All rights reserved. +Created 3. 11. 2002 by Walter Zorn (Web: http://www.walterzorn.com ) +Last modified: 24. 10. 2005 + +Performance optimizations for Internet Explorer +by Thomas Frank and John Holdsworth. +fillPolygon method implemented by Matthieu Haller. + +High Performance JavaScript Graphics Library. +Provides methods +- to draw lines, rectangles, ellipses, polygons + with specifiable line thickness, +- to fill rectangles and ellipses +- to draw text. +NOTE: Operations, functions and branching have rather been optimized +to efficiency and speed than to shortness of source code. + +LICENSE: LGPL + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License (LGPL) as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library 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 +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, +or see http://www.gnu.org/copyleft/lesser.html +*/ + + +var jg_ihtm, jg_ie, jg_fast, jg_dom, jg_moz, +jg_n4 = (document.layers && typeof document.classes != "undefined"); + + +function chkDHTM(x, i) +{ + x = document.body || null; + jg_ie = x && typeof x.insertAdjacentHTML != "undefined"; + jg_dom = (x && !jg_ie && + typeof x.appendChild != "undefined" && + typeof document.createRange != "undefined" && + typeof (i = document.createRange()).setStartBefore != "undefined" && + typeof i.createContextualFragment != "undefined"); + jg_ihtm = !jg_ie && !jg_dom && x && typeof x.innerHTML != "undefined"; + jg_fast = jg_ie && document.all && !window.opera; + jg_moz = jg_dom && typeof x.style.MozOpacity != "undefined"; +} + + +function pntDoc() +{ + this.wnd.document.write(jg_fast? this.htmRpc() : this.htm); + this.htm = ''; +} + + +function pntCnvDom() +{ + var x = document.createRange(); + x.setStartBefore(this.cnv); + x = x.createContextualFragment(jg_fast? this.htmRpc() : this.htm); + this.cnv.appendChild(x); + this.htm = ''; +} + + +function pntCnvIe() +{ + this.cnv.insertAdjacentHTML("BeforeEnd", jg_fast? this.htmRpc() : this.htm); + this.htm = ''; +} + + +function pntCnvIhtm() +{ + this.cnv.innerHTML += this.htm; + this.htm = ''; +} + + +function pntCnv() +{ + this.htm = ''; +} + + +function mkDiv(x, y, w, h) +{ + this.htm += '

    <\/div>'; +} + + +function mkDivIe(x, y, w, h) +{ + this.htm += '%%'+this.color+';'+x+';'+y+';'+w+';'+h+';'; +} + + +function mkDivPrt(x, y, w, h) +{ + this.htm += '
    <\/div>'; +} + + +function mkLyr(x, y, w, h) +{ + this.htm += '<\/layer>\n'; +} + + +var regex = /%%([^;]+);([^;]+);([^;]+);([^;]+);([^;]+);/g; +function htmRpc() +{ + return this.htm.replace( + regex, + '
    \n'); +} + + +function htmPrtRpc() +{ + return this.htm.replace( + regex, + '
    \n'); +} + + +function mkLin(x1, y1, x2, y2) +{ + if (x1 > x2) + { + var _x2 = x2; + var _y2 = y2; + x2 = x1; + y2 = y1; + x1 = _x2; + y1 = _y2; + } + var dx = x2-x1, dy = Math.abs(y2-y1), + x = x1, y = y1, + yIncr = (y1 > y2)? -1 : 1; + + if (dx >= dy) + { + var pr = dy<<1, + pru = pr - (dx<<1), + p = pr-dx, + ox = x; + while ((dx--) > 0) + { + ++x; + if (p > 0) + { + this.mkDiv(ox, y, x-ox, 1); + y += yIncr; + p += pru; + ox = x; + } + else p += pr; + } + this.mkDiv(ox, y, x2-ox+1, 1); + } + + else + { + var pr = dx<<1, + pru = pr - (dy<<1), + p = pr-dy, + oy = y; + if (y2 <= y1) + { + while ((dy--) > 0) + { + if (p > 0) + { + this.mkDiv(x++, y, 1, oy-y+1); + y += yIncr; + p += pru; + oy = y; + } + else + { + y += yIncr; + p += pr; + } + } + this.mkDiv(x2, y2, 1, oy-y2+1); + } + else + { + while ((dy--) > 0) + { + y += yIncr; + if (p > 0) + { + this.mkDiv(x++, oy, 1, y-oy); + p += pru; + oy = y; + } + else p += pr; + } + this.mkDiv(x2, oy, 1, y2-oy+1); + } + } +} + + +function mkLin2D(x1, y1, x2, y2) +{ + if (x1 > x2) + { + var _x2 = x2; + var _y2 = y2; + x2 = x1; + y2 = y1; + x1 = _x2; + y1 = _y2; + } + var dx = x2-x1, dy = Math.abs(y2-y1), + x = x1, y = y1, + yIncr = (y1 > y2)? -1 : 1; + + var s = this.stroke; + if (dx >= dy) + { + if (dx > 0 && s-3 > 0) + { + var _s = (s*dx*Math.sqrt(1+dy*dy/(dx*dx))-dx-(s>>1)*dy) / dx; + _s = (!(s-4)? Math.ceil(_s) : Math.round(_s)) + 1; + } + else var _s = s; + var ad = Math.ceil(s/2); + + var pr = dy<<1, + pru = pr - (dx<<1), + p = pr-dx, + ox = x; + while ((dx--) > 0) + { + ++x; + if (p > 0) + { + this.mkDiv(ox, y, x-ox+ad, _s); + y += yIncr; + p += pru; + ox = x; + } + else p += pr; + } + this.mkDiv(ox, y, x2-ox+ad+1, _s); + } + + else + { + if (s-3 > 0) + { + var _s = (s*dy*Math.sqrt(1+dx*dx/(dy*dy))-(s>>1)*dx-dy) / dy; + _s = (!(s-4)? Math.ceil(_s) : Math.round(_s)) + 1; + } + else var _s = s; + var ad = Math.round(s/2); + + var pr = dx<<1, + pru = pr - (dy<<1), + p = pr-dy, + oy = y; + if (y2 <= y1) + { + ++ad; + while ((dy--) > 0) + { + if (p > 0) + { + this.mkDiv(x++, y, _s, oy-y+ad); + y += yIncr; + p += pru; + oy = y; + } + else + { + y += yIncr; + p += pr; + } + } + this.mkDiv(x2, y2, _s, oy-y2+ad); + } + else + { + while ((dy--) > 0) + { + y += yIncr; + if (p > 0) + { + this.mkDiv(x++, oy, _s, y-oy+ad); + p += pru; + oy = y; + } + else p += pr; + } + this.mkDiv(x2, oy, _s, y2-oy+ad+1); + } + } +} + + +function mkLinDott(x1, y1, x2, y2) +{ + if (x1 > x2) + { + var _x2 = x2; + var _y2 = y2; + x2 = x1; + y2 = y1; + x1 = _x2; + y1 = _y2; + } + var dx = x2-x1, dy = Math.abs(y2-y1), + x = x1, y = y1, + yIncr = (y1 > y2)? -1 : 1, + drw = true; + if (dx >= dy) + { + var pr = dy<<1, + pru = pr - (dx<<1), + p = pr-dx; + while ((dx--) > 0) + { + if (drw) this.mkDiv(x, y, 1, 1); + drw = !drw; + if (p > 0) + { + y += yIncr; + p += pru; + } + else p += pr; + ++x; + } + if (drw) this.mkDiv(x, y, 1, 1); + } + + else + { + var pr = dx<<1, + pru = pr - (dy<<1), + p = pr-dy; + while ((dy--) > 0) + { + if (drw) this.mkDiv(x, y, 1, 1); + drw = !drw; + y += yIncr; + if (p > 0) + { + ++x; + p += pru; + } + else p += pr; + } + if (drw) this.mkDiv(x, y, 1, 1); + } +} + + +function mkOv(left, top, width, height) +{ + var a = width>>1, b = height>>1, + wod = width&1, hod = (height&1)+1, + cx = left+a, cy = top+b, + x = 0, y = b, + ox = 0, oy = b, + aa = (a*a)<<1, bb = (b*b)<<1, + st = (aa>>1)*(1-(b<<1)) + bb, + tt = (bb>>1) - aa*((b<<1)-1), + w, h; + while (y > 0) + { + if (st < 0) + { + st += bb*((x<<1)+3); + tt += (bb<<1)*(++x); + } + else if (tt < 0) + { + st += bb*((x<<1)+3) - (aa<<1)*(y-1); + tt += (bb<<1)*(++x) - aa*(((y--)<<1)-3); + w = x-ox; + h = oy-y; + if (w&2 && h&2) + { + this.mkOvQds(cx, cy, -x+2, ox+wod, -oy, oy-1+hod, 1, 1); + this.mkOvQds(cx, cy, -x+1, x-1+wod, -y-1, y+hod, 1, 1); + } + else this.mkOvQds(cx, cy, -x+1, ox+wod, -oy, oy-h+hod, w, h); + ox = x; + oy = y; + } + else + { + tt -= aa*((y<<1)-3); + st -= (aa<<1)*(--y); + } + } + this.mkDiv(cx-a, cy-oy, a-ox+1, (oy<<1)+hod); + this.mkDiv(cx+ox+wod, cy-oy, a-ox+1, (oy<<1)+hod); +} + + +function mkOv2D(left, top, width, height) +{ + var s = this.stroke; + width += s-1; + height += s-1; + var a = width>>1, b = height>>1, + wod = width&1, hod = (height&1)+1, + cx = left+a, cy = top+b, + x = 0, y = b, + aa = (a*a)<<1, bb = (b*b)<<1, + st = (aa>>1)*(1-(b<<1)) + bb, + tt = (bb>>1) - aa*((b<<1)-1); + + if (s-4 < 0 && (!(s-2) || width-51 > 0 && height-51 > 0)) + { + var ox = 0, oy = b, + w, h, + pxl, pxr, pxt, pxb, pxw; + while (y > 0) + { + if (st < 0) + { + st += bb*((x<<1)+3); + tt += (bb<<1)*(++x); + } + else if (tt < 0) + { + st += bb*((x<<1)+3) - (aa<<1)*(y-1); + tt += (bb<<1)*(++x) - aa*(((y--)<<1)-3); + w = x-ox; + h = oy-y; + + if (w-1) + { + pxw = w+1+(s&1); + h = s; + } + else if (h-1) + { + pxw = s; + h += 1+(s&1); + } + else pxw = h = s; + this.mkOvQds(cx, cy, -x+1, ox-pxw+w+wod, -oy, -h+oy+hod, pxw, h); + ox = x; + oy = y; + } + else + { + tt -= aa*((y<<1)-3); + st -= (aa<<1)*(--y); + } + } + this.mkDiv(cx-a, cy-oy, s, (oy<<1)+hod); + this.mkDiv(cx+a+wod-s+1, cy-oy, s, (oy<<1)+hod); + } + + else + { + var _a = (width-((s-1)<<1))>>1, + _b = (height-((s-1)<<1))>>1, + _x = 0, _y = _b, + _aa = (_a*_a)<<1, _bb = (_b*_b)<<1, + _st = (_aa>>1)*(1-(_b<<1)) + _bb, + _tt = (_bb>>1) - _aa*((_b<<1)-1), + + pxl = new Array(), + pxt = new Array(), + _pxb = new Array(); + pxl[0] = 0; + pxt[0] = b; + _pxb[0] = _b-1; + while (y > 0) + { + if (st < 0) + { + st += bb*((x<<1)+3); + tt += (bb<<1)*(++x); + pxl[pxl.length] = x; + pxt[pxt.length] = y; + } + else if (tt < 0) + { + st += bb*((x<<1)+3) - (aa<<1)*(y-1); + tt += (bb<<1)*(++x) - aa*(((y--)<<1)-3); + pxl[pxl.length] = x; + pxt[pxt.length] = y; + } + else + { + tt -= aa*((y<<1)-3); + st -= (aa<<1)*(--y); + } + + if (_y > 0) + { + if (_st < 0) + { + _st += _bb*((_x<<1)+3); + _tt += (_bb<<1)*(++_x); + _pxb[_pxb.length] = _y-1; + } + else if (_tt < 0) + { + _st += _bb*((_x<<1)+3) - (_aa<<1)*(_y-1); + _tt += (_bb<<1)*(++_x) - _aa*(((_y--)<<1)-3); + _pxb[_pxb.length] = _y-1; + } + else + { + _tt -= _aa*((_y<<1)-3); + _st -= (_aa<<1)*(--_y); + _pxb[_pxb.length-1]--; + } + } + } + + var ox = 0, oy = b, + _oy = _pxb[0], + l = pxl.length, + w, h; + for (var i = 0; i < l; i++) + { + if (typeof _pxb[i] != "undefined") + { + if (_pxb[i] < _oy || pxt[i] < oy) + { + x = pxl[i]; + this.mkOvQds(cx, cy, -x+1, ox+wod, -oy, _oy+hod, x-ox, oy-_oy); + ox = x; + oy = pxt[i]; + _oy = _pxb[i]; + } + } + else + { + x = pxl[i]; + this.mkDiv(cx-x+1, cy-oy, 1, (oy<<1)+hod); + this.mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod); + ox = x; + oy = pxt[i]; + } + } + this.mkDiv(cx-a, cy-oy, 1, (oy<<1)+hod); + this.mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod); + } +} + + +function mkOvDott(left, top, width, height) +{ + var a = width>>1, b = height>>1, + wod = width&1, hod = height&1, + cx = left+a, cy = top+b, + x = 0, y = b, + aa2 = (a*a)<<1, aa4 = aa2<<1, bb = (b*b)<<1, + st = (aa2>>1)*(1-(b<<1)) + bb, + tt = (bb>>1) - aa2*((b<<1)-1), + drw = true; + while (y > 0) + { + if (st < 0) + { + st += bb*((x<<1)+3); + tt += (bb<<1)*(++x); + } + else if (tt < 0) + { + st += bb*((x<<1)+3) - aa4*(y-1); + tt += (bb<<1)*(++x) - aa2*(((y--)<<1)-3); + } + else + { + tt -= aa2*((y<<1)-3); + st -= aa4*(--y); + } + if (drw) this.mkOvQds(cx, cy, -x, x+wod, -y, y+hod, 1, 1); + drw = !drw; + } +} + + +function mkRect(x, y, w, h) +{ + var s = this.stroke; + this.mkDiv(x, y, w, s); + this.mkDiv(x+w, y, s, h); + this.mkDiv(x, y+h, w+s, s); + this.mkDiv(x, y+s, s, h-s); +} + + +function mkRectDott(x, y, w, h) +{ + this.drawLine(x, y, x+w, y); + this.drawLine(x+w, y, x+w, y+h); + this.drawLine(x, y+h, x+w, y+h); + this.drawLine(x, y, x, y+h); +} + + +function jsgFont() +{ + this.PLAIN = 'font-weight:normal;'; + this.BOLD = 'font-weight:bold;'; + this.ITALIC = 'font-style:italic;'; + this.ITALIC_BOLD = this.ITALIC + this.BOLD; + this.BOLD_ITALIC = this.ITALIC_BOLD; +} +var Font = new jsgFont(); + + +function jsgStroke() +{ + this.DOTTED = -1; +} +var Stroke = new jsgStroke(); + + +function jsGraphics(id, wnd) +{ + this.setColor = new Function('arg', 'this.color = arg.toLowerCase();'); + + this.setStroke = function(x) + { + this.stroke = x; + if (!(x+1)) + { + this.drawLine = mkLinDott; + this.mkOv = mkOvDott; + this.drawRect = mkRectDott; + } + else if (x-1 > 0) + { + this.drawLine = mkLin2D; + this.mkOv = mkOv2D; + this.drawRect = mkRect; + } + else + { + this.drawLine = mkLin; + this.mkOv = mkOv; + this.drawRect = mkRect; + } + }; + + + this.setPrintable = function(arg) + { + this.printable = arg; + if (jg_fast) + { + this.mkDiv = mkDivIe; + this.htmRpc = arg? htmPrtRpc : htmRpc; + } + else this.mkDiv = jg_n4? mkLyr : arg? mkDivPrt : mkDiv; + }; + + + this.setFont = function(fam, sz, sty) + { + this.ftFam = fam; + this.ftSz = sz; + this.ftSty = sty || Font.PLAIN; + }; + + + this.drawPolyline = this.drawPolyLine = function(x, y, s) + { + for (var i=0 ; i>1, b = (h -= 1)>>1, + wod = (w&1)+1, hod = (h&1)+1, + cx = left+a, cy = top+b, + x = 0, y = b, + ox = 0, oy = b, + aa2 = (a*a)<<1, aa4 = aa2<<1, bb = (b*b)<<1, + st = (aa2>>1)*(1-(b<<1)) + bb, + tt = (bb>>1) - aa2*((b<<1)-1), + pxl, dw, dh; + if (w+1) while (y > 0) + { + if (st < 0) + { + st += bb*((x<<1)+3); + tt += (bb<<1)*(++x); + } + else if (tt < 0) + { + st += bb*((x<<1)+3) - aa4*(y-1); + pxl = cx-x; + dw = (x<<1)+wod; + tt += (bb<<1)*(++x) - aa2*(((y--)<<1)-3); + dh = oy-y; + this.mkDiv(pxl, cy-oy, dw, dh); + this.mkDiv(pxl, cy+y+hod, dw, dh); + ox = x; + oy = y; + } + else + { + tt -= aa2*((y<<1)-3); + st -= aa4*(--y); + } + } + this.mkDiv(cx-a, cy-oy, w+1, (oy<<1)+hod); + }; + + +/* fillPolygon method, implemented by Matthieu Haller. +This javascript function is an adaptation of the gdImageFilledPolygon for Walter Zorn lib. +C source of GD 1.8.4 found at http://www.boutell.com/gd/ + +THANKS to Kirsten Schulz for the polygon fixes! + +The intersection finding technique of this code could be improved +by remembering the previous intertersection, and by using the slope. +That could help to adjust intersections to produce a nice +interior_extrema. */ + this.fillPolygon = function(array_x, array_y) + { + var i; + var y; + var miny, maxy; + var x1, y1; + var x2, y2; + var ind1, ind2; + var ints; + + var n = array_x.length; + + if (!n) return; + + + miny = array_y[0]; + maxy = array_y[0]; + for (i = 1; i < n; i++) + { + if (array_y[i] < miny) + miny = array_y[i]; + + if (array_y[i] > maxy) + maxy = array_y[i]; + } + for (y = miny; y <= maxy; y++) + { + var polyInts = new Array(); + ints = 0; + for (i = 0; i < n; i++) + { + if (!i) + { + ind1 = n-1; + ind2 = 0; + } + else + { + ind1 = i-1; + ind2 = i; + } + y1 = array_y[ind1]; + y2 = array_y[ind2]; + if (y1 < y2) + { + x1 = array_x[ind1]; + x2 = array_x[ind2]; + } + else if (y1 > y2) + { + y2 = array_y[ind1]; + y1 = array_y[ind2]; + x2 = array_x[ind1]; + x1 = array_x[ind2]; + } + else continue; + + // modified 11. 2. 2004 Walter Zorn + if ((y >= y1) && (y < y2)) + polyInts[ints++] = Math.round((y-y1) * (x2-x1) / (y2-y1) + x1); + + else if ((y == maxy) && (y > y1) && (y <= y2)) + polyInts[ints++] = Math.round((y-y1) * (x2-x1) / (y2-y1) + x1); + } + polyInts.sort(integer_compare); + for (i = 0; i < ints; i+=2) + this.mkDiv(polyInts[i], y, polyInts[i+1]-polyInts[i]+1, 1); + } + }; + + + this.drawString = function(txt, x, y) + { + this.htm += '
    '+ + txt + + '<\/div>'; + }; + + +/* drawStringRect() added by Rick Blommers. +Allows to specify the size of the text rectangle and to align the +text both horizontally (e.g. right) and vertically within that rectangle */ + this.drawStringRect = function(txt, x, y, width, halign) + { + this.htm += '
    '+ + txt + + '<\/div>'; + }; + + + this.drawImage = function(imgSrc, x, y, w, h, a) + { + this.htm += '
    '+ + ''+ + '<\/div>'; + }; + + + this.clear = function() + { + this.htm = ""; + if (this.cnv) this.cnv.innerHTML = this.defhtm; + }; + + + this.mkOvQds = function(cx, cy, xl, xr, yt, yb, w, h) + { + this.mkDiv(xr+cx, yt+cy, w, h); + this.mkDiv(xr+cx, yb+cy, w, h); + this.mkDiv(xl+cx, yb+cy, w, h); + this.mkDiv(xl+cx, yt+cy, w, h); + }; + + this.setStroke(1); + this.setFont('verdana,geneva,helvetica,sans-serif', String.fromCharCode(0x31, 0x32, 0x70, 0x78), Font.PLAIN); + this.color = '#000000'; + this.htm = ''; + this.wnd = wnd || window; + + if (!(jg_ie || jg_dom || jg_ihtm)) chkDHTM(); + if (typeof id != 'string' || !id) this.paint = pntDoc; + else + { + this.cnv = document.all? (this.wnd.document.all[id] || null) + : document.getElementById? (this.wnd.document.getElementById(id) || null) + : null; + this.defhtm = (this.cnv && this.cnv.innerHTML)? this.cnv.innerHTML : ''; + this.paint = jg_dom? pntCnvDom : jg_ie? pntCnvIe : jg_ihtm? pntCnvIhtm : pntCnv; + } + + this.setPrintable(false); +} + + + +function integer_compare(x,y) +{ + return (x < y) ? -1 : ((x > y)*1); +} + diff -Naur gallery-1.5.1/js/wz_tooltip.js gallery-1.5.2/js/wz_tooltip.js --- gallery-1.5.1/js/wz_tooltip.js 1970-01-01 01:00:00.000000000 +0100 +++ gallery-1.5.2/js/wz_tooltip.js 2005-11-21 22:06:24.000000000 +0100 @@ -0,0 +1,475 @@ +/* This notice must be untouched at all times. + +wz_tooltip.js v. 3.34 + +The latest version is available at +http://www.walterzorn.com +or http://www.devira.com +or http://www.walterzorn.de + +Copyright (c) 2002-2004 Walter Zorn. All rights reserved. +Created 1. 12. 2002 by Walter Zorn (Web: http://www.walterzorn.com ) +Last modified: 9. 9. 2005 + +Cross-browser tooltips working even in Opera 5 and 6, +as well as in NN 4, Gecko-Browsers, IE4+, Opera 7 and Konqueror. +No onmouseouts required. +Appearance of tooltips can be individually configured +via commands within the onmouseovers. + +LICENSE: LGPL + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License (LGPL) as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library 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. + +For more details on the GNU Lesser General Public License, +see http://www.gnu.org/copyleft/lesser.html +*/ + +//////////////// GLOBAL TOOPTIP CONFIGURATION ///////////////////// +var ttAbove = false; // tooltip above mousepointer? Alternative: true +var ttBgColor = "#e6ecff"; +var ttBgImg = ""; // path to background image; +var ttBorderColor = "#003399"; +var ttBorderWidth = 1; +var ttDelay = 300; // time span until tooltip shows up [milliseconds] +var ttFontColor = "#003399"; +var ttFontFace = "arial,helvetica,sans-serif"; +var ttFontSize = "11px"; +var ttFontWeight = "normal"; // alternative: "bold"; +var ttLeft = false; // tooltip on the left of the mouse? Alternative: true +var ttOffsetX = 12; // horizontal offset of left-top corner from mousepointer +var ttOffsetY = 15; // vertical offset " +var ttOpacity = 100; // opacity of tooltip in percent (must be integer between 0 and 100) +var ttPadding = 3; // spacing between border and content +var ttShadowColor = ""; +var ttShadowWidth = 0; +var ttStatic = false; // tooltip NOT move with the mouse? Alternative: true +var ttSticky = false; // do NOT hide tooltip on mouseout? Alternative: true +var ttTemp = 0; // time span after which the tooltip disappears; 0 (zero) means "infinite timespan" +var ttTextAlign = "left"; +var ttTitleColor = "#ffffff"; // color of caption text +var ttWidth = 175; +//////////////////// END OF TOOLTIP CONFIG //////////////////////// + + + +////////////// TAGS WITH TOOLTIP FUNCTIONALITY //////////////////// +// List may be extended or shortened: +var tt_tags = new Array("a","area","b","big","caption","center","code","dd","div","dl","dt","em","h1","h2","h3","h4","h5","h6","i","img","input","li","map","ol","p","pre","s","small","span","strike","strong","sub","sup","table","td","th","tr","tt","u","var","ul","layer"); +///////////////////////////////////////////////////////////////////// + + + +///////// DON'T CHANGE ANYTHING BELOW THIS LINE ///////////////////// +var tt_obj, // current tooltip +tt_ifrm, // iframe to cover windowed controls in IE +tt_objW = 0, tt_objH = 0, // width and height of tt_obj +tt_objX = 0, tt_objY = 0, +tt_offX = 0, tt_offY = 0, +xlim = 0, ylim = 0, // right and bottom borders of visible client area +tt_sup = false, // true if T_ABOVE cmd +tt_sticky = false, // tt_obj sticky? +tt_wait = false, +tt_act = false, // tooltip visibility flag +tt_sub = false, // true while tooltip below mousepointer +tt_u = "undefined", +tt_mf, // stores previous mousemove evthandler +// Opera: disable href when hovering +tt_tag = null; // stores hovered dom node, href and previous statusbar txt + + +var tt_db = (document.compatMode && document.compatMode != "BackCompat")? document.documentElement : document.body? document.body : null, +tt_n = navigator.userAgent.toLowerCase(), +tt_nv = navigator.appVersion; +// Browser flags +var tt_op = !!(window.opera && document.getElementById), +tt_op6 = tt_op && !document.defaultView, +tt_op7 = tt_op && !tt_op6, +tt_ie = tt_n.indexOf("msie") != -1 && document.all && tt_db && !tt_op, +tt_ie6 = tt_ie && parseFloat(tt_nv.substring(tt_nv.indexOf("MSIE")+5)) >= 5.5; +tt_n4 = (document.layers && typeof document.classes != tt_u), +tt_n6 = (!tt_op && document.defaultView && typeof document.defaultView.getComputedStyle != tt_u), +tt_w3c = !tt_ie && !tt_n6 && !tt_op && document.getElementById; + +function tt_Int(t_x) +{ + var t_y; + return isNaN(t_y = parseInt(t_x))? 0 : t_y; +} +function wzReplace(t_x, t_y) +{ + var t_ret = "", + t_str = this, + t_xI; + while((t_xI = t_str.indexOf(t_x)) != -1) + { + t_ret += t_str.substring(0, t_xI) + t_y; + t_str = t_str.substring(t_xI + t_x.length); + } + return t_ret+t_str; +} +String.prototype.wzReplace = wzReplace; +function tt_N4Tags(tagtyp, t_d, t_y) +{ + t_d = t_d || document; + t_y = t_y || new Array(); + var t_x = (tagtyp=="a")? t_d.links : t_d.layers; + for(var z = t_x.length; z--;) t_y[t_y.length] = t_x[z]; + for(z = t_d.layers.length; z--;) t_y = tt_N4Tags(tagtyp, t_d.layers[z].document, t_y); + return t_y; +} +function tt_Htm(tt, t_id, txt) +{ + var t_bgc = (typeof tt.T_BGCOLOR != tt_u)? tt.T_BGCOLOR : ttBgColor, + t_bgimg = (typeof tt.T_BGIMG != tt_u)? tt.T_BGIMG : ttBgImg, + t_bc = (typeof tt.T_BORDERCOLOR != tt_u)? tt.T_BORDERCOLOR : ttBorderColor, + t_bw = (typeof tt.T_BORDERWIDTH != tt_u)? tt.T_BORDERWIDTH : ttBorderWidth, + t_ff = (typeof tt.T_FONTFACE != tt_u)? tt.T_FONTFACE : ttFontFace, + t_fc = (typeof tt.T_FONTCOLOR != tt_u)? tt.T_FONTCOLOR : ttFontColor, + t_fsz = (typeof tt.T_FONTSIZE != tt_u)? tt.T_FONTSIZE : ttFontSize, + t_fwght = (typeof tt.T_FONTWEIGHT != tt_u)? tt.T_FONTWEIGHT : ttFontWeight, + t_opa = (typeof tt.T_OPACITY != tt_u)? tt.T_OPACITY : ttOpacity, + t_padd = (typeof tt.T_PADDING != tt_u)? tt.T_PADDING : ttPadding, + t_shc = (typeof tt.T_SHADOWCOLOR != tt_u)? tt.T_SHADOWCOLOR : (ttShadowColor || 0), + t_shw = (typeof tt.T_SHADOWWIDTH != tt_u)? tt.T_SHADOWWIDTH : (ttShadowWidth || 0), + t_algn = (typeof tt.T_TEXTALIGN != tt_u)? tt.T_TEXTALIGN : ttTextAlign, + t_tit = (typeof tt.T_TITLE != tt_u)? tt.T_TITLE : "", + t_titc = (typeof tt.T_TITLECOLOR != tt_u)? tt.T_TITLECOLOR : ttTitleColor, + t_w = (typeof tt.T_WIDTH != tt_u)? tt.T_WIDTH : ttWidth; + if(t_shc || t_shw) + { + t_shc = t_shc || "#cccccc"; + t_shw = t_shw || 5; + } + if(tt_n4 && (t_fsz == "10px" || t_fsz == "11px")) t_fsz = "12px"; + + var t_optx = (tt_n4? '' : tt_n6? ('-moz-opacity:'+(t_opa/100.0)) : tt_ie? ('filter:Alpha(opacity='+t_opa+')') : ('opacity:'+(t_opa/100.0))) + ';'; + var t_y = '
    ' + + ''; + if(t_tit) + { + t_y += '
    ' + + (tt_n4? ' ' : '')+t_tit+'<\/b><\/font><\/td><\/tr>'; + } + t_y += '
    ' + + ''; + if(t_fwght == 'bold') t_y += ''; + t_y += txt; + if(t_fwght == 'bold') t_y += '<\/b>'; + t_y += '<\/font><\/td><\/tr><\/table><\/td><\/tr><\/table>'; + if(t_shw) + { + var t_spct = Math.round(t_shw*1.3); + if(tt_n4) + { + t_y += '<\/layer>' + + '<\/layer>'; + } + else + { + t_optx = tt_n6? '-moz-opacity:0.85;' : tt_ie? 'filter:Alpha(opacity=85);' : 'opacity:0.85;'; + t_y += '
    <\/div>' + + '
    <\/div>'; + } + } + return(t_y+'<\/div>' + + (tt_ie6 ? '