return function on snapshot rename returns to renamed snapshot

Author: jonmatifa

cmd.cgi

@@ -92,7 +92,8 @@ elsif ($in{'cmd'} =~ "rename")  {
 		$cmd = ($config{'snap_properties'} =~ /1/) ? "zfs rename ".$in{'force'}.$in{'recurse'}.$in{'zfs'}." ".$in{'parent'}.'@'.$in{'name'} : undef;
 		@footer = ('status.cgi?snap='.$in{'parent'}.'@'.$in{'name'}, $in{'parent'}.'@'.$in{'name'});
 	} elsif (index($in{'zfs'}, '/') != -1) { 
-		$cmd = ($config{'zfs_properties'} =~ /1/) ? "zfs rename ".$in{'force'}.$in{'prnt'}.$in{'zfs'}." ".$in{'parent'}.'/'.$in{'name'} : undef; 
+		$cmd = ($config{'zfs_properties'} =~ /1/) ? "zfs rename ".$in{'force'}.$in{'prnt'}.$in{'zfs'}." ".$in{'parent'}.'/'.$in{'name'} : undef;
+		if ($in{'confirm'}) { @footer = ('status.cgi?zfs='.$in{'parent'}.'/'.$in{'name'}, $in{'parent'}.'/'.$in{'name'}); }
 	}
         ui_cmd($in{'zfs'}." to ".$in{'name'}, $cmd);
 }

create.cgi

@@ -168,24 +168,24 @@ if ($in{'create'} =~ "zpool")
 	$in{'snap'} = $in{'clone'};
 } elsif ($in{'rename'}) {
 	ui_print_header(undef, "Rename", "", undef, 1, 1);
-        print ui_form_start("cmd.cgi", "post");
+    print ui_form_start("cmd.cgi", "post");
 	%parent = find_parent($in{'rename'});
 	if (index($in{'rename'}, '@') != -1) {
 		#is snapshot
 		print ui_hidden('confirm', 'yes');
 		$parent = $parent{'filesystem'};
 		print ui_table_start('Rename snapshot', 'width=100%', '6');
-        	print ui_table_row(undef, '<b>Snapshot:</b> '.$in{'rename'});
-        	print ui_table_row(undef, "<b>New Name: </b>".$parent."@".ui_textbox('name'));
+       	print ui_table_row(undef, '<b>Snapshot:</b> '.$in{'rename'});
+      	print ui_table_row(undef, "<b>New Name: </b>".$parent."@".ui_textbox('name', $parent{'snapshot'}, 35));
 		print ui_table_row(undef, ui_checkbox("recurse", "-r ", "Recursively rename the snapshots of all descendent datasets."));
 		@footer = ("status.cgi?snap=".$in{'rename'}, $in{'rename'});
 	} elsif (index($in{'rename'}, '/') != -1) {
-                #is filesystem
+        #is filesystem
 		$parent = $parent{'pool'};
 		ui_zfs_list("-r ".$in{'rename'});
 		print ui_table_start('Rename filesystem', 'width=100%', '6');
                 print ui_table_row(undef, '<b>Filesystem:</b> '.$in{'rename'});
-                print ui_table_row(undef, "<b>New Name: </b>".$parent."/".ui_textbox('name'));
+                print ui_table_row(undef, "<b>New Name: </b>".$parent."/".ui_textbox('name', undef, 35));
 		print ui_table_row(undef, ui_checkbox("prnt", "-p ", "Create all the nonexistent parent datasets."));
 	}
 	print ui_table_row(undef, ui_checkbox("force", "-f ", "Force unmount any filesystems that need to be unmounted in the process."));

zfsmanager-lib.pl

@@ -358,6 +358,7 @@ sub find_parent
 ($parent{'pool'}) = split(/[@\/]/g, $filesystem);
 $null = reverse $filesystem =~ /[@\/]/g;
 $parent{'filesystem'} = substr $filesystem, 0, $-[0];
+if (index($filesystem, '@') != -1) { (undef, $parent{'snapshot'}) = split(/@/, $filesystem); }
 return %parent;
 }