Merge remote-tracking branch 'origin/master'

exec/init-fidonet.js

@@ -618,7 +618,7 @@ if(echolist_fname && file_size(echolist_fname) > 0) {
 	}
 	if(network.areatitle_prefix) {
 		print("Removing " + network.areatitle_prefix + " Title Prefixes from " + echolist_fname);
-		var result = remove_prefix_from_titles(echolist_fname, network.areatitle_prefix);
+		var result = remove_prefix_from_title(echolist_fname, network.areatitle_prefix);
 		if(result !== true)
 			alert(result);
 	}

webv4/lib/pages.js

@@ -70,7 +70,7 @@ function getCtrlLine(file) {
 			f.close();
 			break;
 		default:
-			ctrl = file_getname(file);
+			ctrl = pageName(file_getname(file));
 			break;
 	}
 
@@ -153,7 +153,7 @@ function _getPageList(dir) {
 }
 
 function pageName(p) {
-	return p.replace(/^\d*-/, '');
+	return p.replace(/^\d*-/, '').replace(/\..*$/, '');
 }
 
 function mergePageLists(stock, mods) {