re-added ability to delete catalogs, fixed exception error with id3 library

4 files changed, 13 insertions, 13 deletions

diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php
index ed9ac236..38871dc1 100644
--- a/templates/show_add_user.inc.php
+++ b/templates/show_add_user.inc.php
@@ -73,6 +73,8 @@
                 <select name="access">
                 <option value="5" <?php echo $on_5; ?>><?php echo _('Guest'); ?></option>
                 <option value="25" <?php echo $on_25; ?>><?php echo _('User'); ?></option>
+		<option value="50" <?php echo $on_50; ?>><?php echo _('Content Manager'); ?></option>
+		<option value="75" <?php echo $on_75; ?>><?php echo _('Catalog Manager'); ?></option>
                 <option value="100" <?php echo $on_100; ?>><?php echo _('Admin'); ?></option>
                 </select>
         </td>
diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php
index 0ecc4984..81b2c06e 100644
--- a/templates/show_preferences.inc.php
+++ b/templates/show_preferences.inc.php
@@ -35,7 +35,9 @@ if ($_REQUEST['tab'] != 'account' && $_REQUEST['tab'] != 'modules') {
 	<input class="button" type="submit" value="<?php echo _('Update Preferences'); ?>" />
 	<input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" />
 	<input type="hidden" name="method" value="<?php echo scrub_out($_REQUEST['action']); ?>" />
-	<input class="button" type="submit" name="action" value="<?php echo _("Cancel"); ?>" />
+	<?php if ($GLOBALS['user']->has_access('100')) { ?>
+		<input type="hidden" name="user_id" value="<?php echo scrub_out($_REQUEST['user_id']); ?>" />
+	<?php } ?>
 <?php
 }  // end if not account
 if ($_REQUEST['tab'] == 'account') { 
diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php
index 640978c7..087aa85b 100644
--- a/templates/show_users.inc.php
+++ b/templates/show_users.inc.php
@@ -30,22 +30,14 @@ $web_path = Config::get('web_path');
 </tr>
 <tr class="table-header">
 	<td align="center">
-		<a href="<?php echo $web_path; ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&amp;keep_view=true&amp;sort_type=fullname&amp;sort_order=0">
 		<b><?php echo _('Fullname'); ?></b>
-		</a>
-		<a href="<?php echo $web_path; ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&amp;keep_view=true&amp;sort_type=username&amp;sort_order=0">
 		<b>(<?php echo _('Username'); ?>)</b>
-		</a>
 	</td>
         <td align="center">
-		<a href="<?php echo $web_path; ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&amp;keep_view=true&amp;sort_type=last_seen&amp;sort_order=0">
 		<b><?php echo _('Last Seen'); ?></b>
-		</a>
 	</td>
         <td align="center">
-		<a href="<?php echo $web_path; ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&amp;keep_view=true&amp;sort_type=create_date&amp;sort_order=0">
 		<b><?php echo _('Registration Date'); ?></b>
-		</a>
 	</td>
         <td align="center">
 		<b><?php echo _('Activity'); ?></b>
@@ -69,7 +61,7 @@ foreach ($object_ids as $user_id) {
 ?>
 <tr class="<?php echo flip_class(); ?>" align="center">
 	<td align="left">
-		<a href="<?php echo $web_path; ?>/admin/users.php?action=edit&amp;user_id=<?php echo $client->id; ?>">
+		<a href="<?php echo $web_path; ?>/stats.php?action=show_user&amp;user_id=<?php echo $client->id; ?>">
 			<?php echo $client->fullname; ?> (<?php echo $client->username; ?>)
 		</a>
 	</td>
@@ -92,9 +84,10 @@ foreach ($object_ids as $user_id) {
 		<a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&amp;user_id=<?php echo $client->id; ?>">
 			<?php echo get_user_icon('edit'); ?>
 		</a>
-		<a href="<?php echo $web_path; ?>/admin/preferences.php?action=user&amp;user_id=<?php echo $client->id; ?>">
+<!--		<a href="<?php echo $web_path; ?>/preferences.php?action=user&amp;user_id=<?php echo $client->id; ?>">
 			<?php echo get_user_icon('preferences'); ?>
 		</a>
+-->
 	<?php
 	//FIXME: Fix this for the extra permission levels
 	if ($working_user->disabled == '1') { 
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index e35d1d98..04c68612 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -2,17 +2,20 @@
 <span><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a></span>
 <hr />
 <?php 
-	$catalogs = Catalog::get_catalogs(); 
+	$catalogs = Catalog::get_catalog_ids(); 
 	foreach ($catalogs as $catalog_id) { 
 		$catalog = new Catalog($catalog_id); 
 ?>
 <strong><a href="<?php echo $web_path; ?>/admin/catalog?action=show_customize_catalog">
 	<?php echo $catalog->name; ?>
+	<a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=show_delete_catalog&amp;catalog_id=<?php echo $catalog->id; ?>">
+		<?php echo get_user_icon('delete','',_('Delete Catalog')); ?>
+	</a>
 </a></strong><br />
 <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Add'); ?></a>
 | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Verify'); ?></a>
 | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Clean'); ?></a>
-<?php } ?>
+<?php } // end foreach catalogs ?>
 <hr />
 <h4><?php echo _('User Tools'); ?></h4>
 <span><a href="<?php echo $web_path; ?>/admin/users.php?action=show_add_user"><?php echo _('Add User'); ?></a></span>