Fix encoding again and update the link after renaming files

files/index.php

@@ -71,7 +71,7 @@ $breadcrumb = array();
 $pathtohere = "";
 foreach( explode( "/", $dir ) as $i ){
 	if( $i != "" ){
-		$pathtohere .= "/".urlencode($i);
+		$pathtohere .= "/".str_replace('+','%20', urlencode($i));
 		$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
 	}
 }

files/js/filelist.js

@@ -136,6 +136,8 @@ FileList={
 			var newname=input.val();
 			tr.attr('data-file',newname);
 			td.children('a.name').empty();
+			var path = td.children('a.name').attr('href');
+			td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
 			if(newname.indexOf('.')>0){
 				basename=newname.substr(0,newname.lastIndexOf('.'));
 			}else{

files/templates/part.list.php

@@ -4,11 +4,15 @@
 			if($simple_size_color<0) $simple_size_color = 0;
 			$relative_modified_date = relative_modified_date($file['mtime']);
 			$relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14
-			if($relative_date_color>200) $relative_date_color = 200; ?>
-			<tr data-file="<?php echo str_replace('+','%2B',urlencode($file['name']));?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
+			if($relative_date_color>200) $relative_date_color = 200;
+			$name = str_replace('+','%20',urlencode($file['name']));
+			$name = str_replace('%2F','/', $name);
+			$directory = str_replace('+','%20',urlencode($file['directory']));
+			$directory = str_replace('%2F','/', $directory); ?>
+			<tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mime']?>" data-size='<?php echo $file['size'];?>'>
 				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo mimetype_icon('dir'); else echo mimetype_icon($file['mime']); ?>)">
 					<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
-					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].str_replace('%2F','/',urlencode($file['directory'])).'/'.urlencode($file['name']); else echo $_['downloadURL'].str_replace('%2F','/',urlencode($file['directory'])).'/'.urlencode($file['name']); ?>" title="">
+					<a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$directory.'/'.$name; else echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
 					<span class="nametext">
 						<?php if($file['type'] == 'dir'):?>
 							<?php echo htmlspecialchars($file['name']);?>