From: Bharat M. <bh...@us...> - 2002-01-19 01:00:57
|
Update of /cvsroot/gallery/gallery In directory usw-pr-cvs1:/tmp/cvs-serv24793 Modified Files: view_photo.php view_album.php do_command.php Log Message: Replace references to: header("Location: albums.php"); with: header("Location: " . makeAlbumUrl()); as the makeAlbumUrl() function will always Do the Right Thing. Index: view_photo.php =================================================================== RCS file: /cvsroot/gallery/gallery/view_photo.php,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- view_photo.php 2002/01/04 19:06:15 1.78 +++ view_photo.php 2002/01/19 01:00:53 1.79 @@ -31,7 +31,7 @@ <? // Hack check if (!$gallery->user->canReadAlbum($gallery->album)) { - header("Location: albums.php"); + header("Location: " . makeAlbumUrl()); return; } @@ -39,10 +39,7 @@ $index = $gallery->album->getPhotoIndex($id); if ($index == -1) { // That photo no longer exists. - header("Location: " . - $gallery->app->photoAlbumURL . - "/" . - $gallery->session->albumName); + header("Location: " . makeAlbumUrl($gallery->session->albumName)); return; } } else { Index: view_album.php =================================================================== RCS file: /cvsroot/gallery/gallery/view_album.php,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- view_album.php 2002/01/04 19:03:09 1.102 +++ view_album.php 2002/01/19 01:00:53 1.103 @@ -31,12 +31,12 @@ <? // Hack check if (!$gallery->user->canReadAlbum($gallery->album)) { - header("Location: albums.php"); + header("Location: " . makeAlbumUrl()); return; } if (!$gallery->album->isLoaded()) { - header("Location: albums.php"); + header("Location: " . makeAlbumUrl()); return; } Index: do_command.php =================================================================== RCS file: /cvsroot/gallery/gallery/do_command.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- do_command.php 2001/09/11 06:14:05 1.25 +++ do_command.php 2002/01/19 01:00:53 1.26 @@ -135,7 +135,7 @@ $gallery->session->albumName); header("Location: $url"); } else { - header("Location: albums.php"); + header("Location: " . makeAlbumUrl()); } } else if (!strcmp($cmd, "reset-album-clicks")) { $myAlbum = new Album(); @@ -145,7 +145,7 @@ // this is a popup do dismiss and reload! dismissAndReload(); } else { - header("Location: albums.php"); + header("Location: " . makeAlbumUrl()); } } else if (!strcmp($cmd, "delete-comment")) { @@ -154,7 +154,7 @@ $gallery->album->save(); dismissAndReload(); } else { - header("Location: albums.php"); + header("Location: " . makeAlbumUrl()); } } else if (!empty($return)) { |