diff options
| -rw-r--r-- | admin/catalog.php | 4 | ||||
| -rw-r--r-- | lib/class/catalog.class.php | 4 | ||||
| -rw-r--r-- | templates/show_random_albums.inc.php | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/admin/catalog.php b/admin/catalog.php index d103ecae..9c3c9b1b 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -244,9 +244,9 @@ switch ($_REQUEST['action']) { case 'show_delete_catalog': /* Stop the demo hippies */ if (conf('demo_mode')) { break; } - + $catalog = new Catalog($_REQUEST['catalog_id']); $nexturl = conf('web_path') . '/admin/catalog.php?action=delete_catalog&catalog_id=' . scrub_out($_REQUEST['catalog_id']); - show_confirmation(_('Delete Catalog'),_('Do you really want to delete this catalog?'),$nexturl,1); + show_confirmation(_('Delete Catalog'),_('Do you really want to delete this catalog?') . " -- $catalog->name ($catalog->path)",$nexturl,1); break; case 'show_customize_catalog': include(conf('prefix') . '/templates/show_edit_catalog.inc.php'); diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index 2c849e7d..bbb6c329 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -761,6 +761,10 @@ class Catalog { $catalog_id = $this->create_catalog_entry($path,$name,$key, $ren, $sort, $type); } + // Make sure they don't have a trailing / or \ on their path + $path = rtrim($path,"/"); + $path = rtrim($path,"\\"); + /* Setup the $this with the new information */ $this->id = $catalog_id; $this->path = $path; diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php index b2f3348d..3217088f 100644 --- a/templates/show_random_albums.inc.php +++ b/templates/show_random_albums.inc.php @@ -31,7 +31,7 @@ $web_path = conf('web_path'); ?> <td> <a href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $album_id; ?>"> - <img src="<?php echo $web_path; ?>/image.php?thumb=1&id=<?php echo $album_id; ?>" width="75" height="75" border="0" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" /> + <img src="<?php echo $web_path; ?>/image.php?thumb=3&id=<?php echo $album_id; ?>" width="80" height="80" border="0" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" /> </a> </td> <?php } ?> |