From: Joan M. <je...@us...> - 2003-11-29 10:30:37
|
Update of /cvsroot/gallery/gallery In directory sc8-pr-cvs1:/tmp/cvs-serv24952 Modified Files: ChangeLog Version.php add_comment.php albums.php photo_owner.php util.php view_photo.php Log Message: 2003-11-29 Joan McGalliard <ga...@jo...> 1.4.2-cvs-b43 * Fixed bug were reset clicks did not work in albums.php. * Commenter name format is configurable. * Fixed bug were top navbox was missing a line (or had it double thickness) in view_photo.php when there was no adminbox. * Removed setup/.htaccess from manifest. Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.760 retrieving revision 1.761 diff -u -r1.760 -r1.761 --- ChangeLog 28 Nov 2003 15:47:06 -0000 1.760 +++ ChangeLog 29 Nov 2003 10:30:01 -0000 1.761 @@ -1,3 +1,14 @@ +2003-11-29 Joan McGalliard <ga...@jo...> 1.4.2-cvs-b43 + + * Fixed bug were reset clicks did not work in albums.php. + + * Commenter name format is configurable. + + * Fixed bug were top navbox was missing a line (or had it double + thickness) in view_photo.php when there was no adminbox. + + * Removed setup/.htaccess from manifest. + 2003-11-28 Jens Tkotz <je...@pe...> 1.4.2-cvs-b42 * Bugfix: poll_results.php contained blank line in header Index: Version.php =================================================================== RCS file: /cvsroot/gallery/gallery/Version.php,v retrieving revision 1.537 retrieving revision 1.538 diff -u -r1.537 -r1.538 --- Version.php 28 Nov 2003 15:47:06 -0000 1.537 +++ Version.php 29 Nov 2003 10:30:02 -0000 1.538 @@ -40,8 +40,8 @@ $gallery = new stdClass(); } -$gallery->version = '1.4.2-cvs-b42'; -$gallery->config_version = 76; +$gallery->version = '1.4.2-cvs-b43'; +$gallery->config_version = 77; $gallery->album_version = 25; $gallery->user_version = 5; $gallery->url = "http://gallery.sourceforge.net"; Index: add_comment.php =================================================================== RCS file: /cvsroot/gallery/gallery/add_comment.php,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- add_comment.php 14 Nov 2003 14:11:27 -0000 1.27 +++ add_comment.php 29 Nov 2003 10:30:02 -0000 1.28 @@ -65,6 +65,13 @@ } $error_text = ""; +if (empty($commenter_name)) { + $commenter_name=user_name_string($gallery->user->getUID(), + $gallery->app->comments_display_name); +} +if (empty($comment_text)) { + $comment_text=''; +} if (isset($save)) { if (!empty($commenter_name) && !empty($comment_text)) { @@ -114,23 +121,14 @@ <td class="popup"><?php echo _("Name or email:") ?></td> <td> <?php -if (!isset($commenter_name)) { - $commenter_name=''; -} -if (!isset($comment_text)) { - $comment_text=''; -} if (!$gallery->user->isLoggedIn() ) { echo "<input name=\"commenter_name\" value=\"".$commenter_name."\" size=\"30\">"; } else { - if (empty($commenter_name)) { - $commenter_name=user_name_string($gallery->user->getUID()); - } if ($gallery->app->comments_anonymous == 'yes') { echo '<input name="commenter_name" value="'.$commenter_name.'" size="30">'; } else { echo $commenter_name; - echo '<input type="hidden" name="commenter_name" value="'.$commenter_name.'" size="30">'; + echo '<input type="hidden" name="commenter_name" value="" size="30">'; } } ?> Index: albums.php =================================================================== RCS file: /cvsroot/gallery/gallery/albums.php,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- albums.php 13 Nov 2003 13:54:53 -0000 1.111 +++ albums.php 29 Nov 2003 10:30:02 -0000 1.112 @@ -402,7 +402,7 @@ if ($gallery->user->canWriteToAlbum($gallery->album) && (!($gallery->album->fields["display_clicks"] == "no"))) { ?> -<?php echo " ".popup_link("[" . _("reset counter") ."]", "'" . doCommand("reset-album-clicks", array("set_albumName" => $albumName), "albums.php") . "'" , 1) ?> +<?php echo " ".popup_link("[" . _("reset counter") ."]", doCommand("reset-album-clicks", array("set_albumName" => $albumName), "albums.php"), 1) ?> <?php } Index: photo_owner.php =================================================================== RCS file: /cvsroot/gallery/gallery/photo_owner.php,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- photo_owner.php 17 Oct 2003 13:32:29 -0000 1.12 +++ photo_owner.php 29 Nov 2003 10:30:02 -0000 1.13 @@ -48,7 +48,7 @@ $gallery->album->setItemOwnerById($id, $owner); $user=$gallery->userDB->getUserByUid($owner); $gallery->album->save(array(i18n("New owner %s for %s"), - $user->printableName(), + $user->printableName('!!FULLNAME!! (!!USERNAME!!)'), makeAlbumURL($gallery->album->fields["name"], $id))); Index: util.php =================================================================== RCS file: /cvsroot/gallery/gallery/util.php,v retrieving revision 1.289 retrieving revision 1.290 diff -u -r1.289 -r1.290 --- util.php 28 Nov 2003 15:47:06 -0000 1.289 +++ util.php 29 Nov 2003 10:30:03 -0000 1.290 @@ -3150,13 +3150,15 @@ } } -function user_name_string($uid) { +function user_name_string($uid, $format='!!FULLNAME!! (!!USERNAME!!)') { global $gallery; - $user=$gallery->userDB->getUserByUid($uid); - if (!$user || $user->isPseudo()) { + if ($uid) { + $user=$gallery->userDB->getUserByUid($uid); + } + if (empty($user) || $user->isPseudo()) { return ""; } else { - return $user->printableName(); + return $user->printableName($format); } } Index: view_photo.php =================================================================== RCS file: /cvsroot/gallery/gallery/view_photo.php,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- view_photo.php 20 Nov 2003 16:40:41 -0000 1.154 +++ view_photo.php 29 Nov 2003 10:30:03 -0000 1.155 @@ -552,23 +552,23 @@ } </script> <?php +} includeLayout('navtablebegin.inc'); - if ($adminCommands) { - - $adminCommands = "<span class=\"admin\">$adminCommands</span>"; - $adminbox["commands"] = $adminCommands; - $adminbox["text"] = " "; +if ($adminCommands) { + + $adminCommands = "<span class=\"admin\">$adminCommands</span>"; + $adminbox["commands"] = $adminCommands; + $adminbox["text"] = " "; - $adminbox["bordercolor"] = $bordercolor; - $adminbox["top"] = true; - includeLayout('adminbox.inc'); - } + $adminbox["bordercolor"] = $bordercolor; + $adminbox["top"] = true; + includeLayout('adminbox.inc'); + includeLayout('navtablemiddle.inc'); } $breadcrumb["bordercolor"] = $bordercolor; $breadcrumb["top"] = true; $breadcrumb['bottom'] = false; -includeLayout('navtablemiddle.inc'); includeLayout('breadcrumb.inc'); includeLayout('navtablemiddle.inc'); includeLayout('navphoto.inc'); |