remove unused functions and start removing the ominous f argument

1 files changed, 6 insertions, 128 deletions

diff --git a/view/js/main.js b/view/js/main.js
index 6fda3c8d0..3307086d4 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -93,7 +93,7 @@ $(document).ready(function() {
 	$(document).on('click focus', '.comment-edit-form  textarea', function(e) {
 		if(! this.autocomplete_handled) {
 			/* autocomplete @nicknames */
-			$(this).editor_autocomplete(baseurl+"/acl?f=&n=1");
+			$(this).editor_autocomplete(baseurl+"/acl?n=1");
 			/* autocomplete bbcode */
 			$(this).bbco_autocomplete('bbcode');
 
@@ -250,7 +250,7 @@ $(document).ready(function() {
 });
 
 function getConversationSettings() {
-	$.get('settings/conversation/?f=&aj=1',function(data) {
+	$.get('settings/conversation/?aj=1',function(data) {
 		$('#conversation_settings_body').html(data);
 	});
 }
@@ -486,7 +486,7 @@ function insertCommentURL(comment, id) {
 	if(reply && reply.length) {
 		reply = bin2hex(reply);
 		$('body').css('cursor', 'wait');
-		$.get('linkinfo?f=&binurl=' + reply, function(data) {
+		$.get('linkinfo?binurl=' + reply, function(data) {
 			var tmpStr = $("#comment-edit-text-" + id).val();
 			if(tmpStr == comment) {
 				tmpStr = "";
@@ -566,7 +566,7 @@ function closeMenu(theID) {
 }
 
 function markRead(notifType) {
-	$.get('notifications?f=&markRead='+notifType);
+	$.get('notifications?markRead='+notifType);
 	$('.' + notifType + '-button').fadeOut(function() {
 		$("." + notifType + "-update").html('0');
 		$('#nav-' + notifType + '-menu').html('');
@@ -579,7 +579,7 @@ function markRead(notifType) {
 }
 
 function markItemRead(itemId) {
-	$.get('notifications?f=&markItemRead='+itemId);
+	$.get('notifications?markItemRead='+itemId);
 	$('.unseen-wall-indicator-'+itemId).remove();
 }
 
@@ -1144,7 +1144,7 @@ function pageUpdate() {
 		bParam_page = 1;
 	}
 
-	update_url = baseurl + '/' + decodeURIComponent(page_query) + '/?f=&aj=1&page=' + bParam_page + extra_args ;
+	update_url = baseurl + '/' + decodeURIComponent(page_query) + '/?aj=1&page=' + bParam_page + extra_args ;
 
 	$("#page-spinner").show();
 	update_mode = 'append';
@@ -1622,11 +1622,6 @@ $(window).scroll(function () {
 	}
 });
 
-function addhtmltext(data) {
-	data = h2b(data);
-	addeditortext(data);
-}
-
 function loadText(textRegion,data) {
 	var currentText = $(textRegion).val();
 	$(textRegion).val(currentText + data);
@@ -1639,123 +1634,6 @@ function addeditortext(data) {
 	}
 }
 
-function h2b(s) {
-	var y = s;
-	function rep(re, str) {
-		y = y.replace(re,str);
-	}
-
-	rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
-	rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");
-	rep(/<span style=\"color:(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");
-	rep(/<font>(.*?)<\/font>/gi,"$1");
-	rep(/<img.*?width=\"(.*?)\".*?height=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$1x$2]$3[/img]");
-	rep(/<img.*?height=\"(.*?)\".*?width=\"(.*?)\".*?src=\"(.*?)\".*?\/>/gi,"[img=$2x$1]$3[/img]");
-	rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]");
-	rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]");
-	rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
-
-	rep(/<ul class=\"listbullet\" style=\"list-style-type\: circle\;\">(.*?)<\/ul>/gi,"[list]$1[/list]");
-	rep(/<ul class=\"listnone\" style=\"list-style-type\: none\;\">(.*?)<\/ul>/gi,"[list=]$1[/list]");
-	rep(/<ul class=\"listdecimal\" style=\"list-style-type\: decimal\;\">(.*?)<\/ul>/gi,"[list=1]$1[/list]");
-	rep(/<ul class=\"listlowerroman\" style=\"list-style-type\: lower-roman\;\">(.*?)<\/ul>/gi,"[list=i]$1[/list]");
-	rep(/<ul class=\"listupperroman\" style=\"list-style-type\: upper-roman\;\">(.*?)<\/ul>/gi,"[list=I]$1[/list]");
-	rep(/<ul class=\"listloweralpha\" style=\"list-style-type\: lower-alpha\;\">(.*?)<\/ul>/gi,"[list=a]$1[/list]");
-	rep(/<ul class=\"listupperalpha\" style=\"list-style-type\: upper-alpha\;\">(.*?)<\/ul>/gi,"[list=A]$1[/list]");
-	rep(/<li>(.*?)<\/li>/gi,"[li]$1[/li]");
-
-	rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");
-	rep(/<\/(strong|b)>/gi,"[/b]");
-	rep(/<(strong|b)>/gi,"[b]");
-	rep(/<\/(em|i)>/gi,"[/i]");
-	rep(/<(em|i)>/gi,"[i]");
-	rep(/<\/u>/gi,"[/u]");
-
-	rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");
-	rep(/<u>/gi,"[u]");
-	rep(/<blockquote[^>]*>/gi,"[quote]");
-	rep(/<\/blockquote>/gi,"[/quote]");
-	rep(/<hr \/>/gi,"[hr]");
-	rep(/<br (.*?)\/>/gi,"\n");
-	rep(/<br\/>/gi,"\n");
-	rep(/<br>/gi,"\n");
-	rep(/<p>/gi,"");
-	rep(/<\/p>/gi,"\n");
-	rep(/&nbsp;/gi," ");
-	rep(/&quot;/gi,"\"");
-	rep(/&lt;/gi,"<");
-	rep(/&gt;/gi,">");
-	rep(/&amp;/gi,"&");
-
-	return y;
-}
-
-function b2h(s) {
-	var y = s;
-	function rep(re, str) {
-		y = y.replace(re,str);
-	}
-
-	rep(/\&/gi,"&amp;");
-	rep(/\</gi,"&lt;");
-	rep(/\>/gi,"&gt;");
-	rep(/\"/gi,"&quot;");
-
-	rep(/\n/gi,"<br />");
-	rep(/\[b\]/gi,"<strong>");
-	rep(/\[\/b\]/gi,"</strong>");
-	rep(/\[i\]/gi,"<em>");
-	rep(/\[\/i\]/gi,"</em>");
-	rep(/\[u\]/gi,"<u>");
-	rep(/\[\/u\]/gi,"</u>");
-	rep(/\[hr\]/gi,"<hr />");
-	rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
-	rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
-	rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");
-	rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
-
-	rep(/\[zrl=([^\]]+)\](.*?)\[\/zrl\]/gi,"<a href=\"$1" + '?f=&zid=' + zid + "\">$2</a>");
-	rep(/\[zrl\](.*?)\[\/zrl\]/gi,"<a href=\"$1" + '?f=&zid=' + zid + "\">$1</a>");
-	rep(/\[zmg=(.*?)x(.*?)\](.*?)\[\/zmg\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3" + '?f=&zid=' + zid + "\" />");
-	rep(/\[zmg\](.*?)\[\/zmg\]/gi,"<img src=\"$1" + '?f=&zid=' + zid + "\" />");
-
-	rep(/\[list\](.*?)\[\/list\]/gi, '<ul class="listbullet" style="list-style-type: circle;">$1</ul>');
-	rep(/\[list=\](.*?)\[\/list\]/gi, '<ul class="listnone" style="list-style-type: none;">$1</ul>');
-	rep(/\[list=1\](.*?)\[\/list\]/gi, '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>');
-	rep(/\[list=i\](.*?)\[\/list\]/gi,'<ul class="listlowerroman" style="list-style-type: lower-roman;">$1</ul>');
-	rep(/\[list=I\](.*?)\[\/list\]/gi, '<ul class="listupperroman" style="list-style-type: upper-roman;">$1</ul>');
-	rep(/\[list=a\](.*?)\[\/list\]/gi, '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$1</ul>');
-	rep(/\[list=A\](.*?)\[\/list\]/gi, '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$1</ul>');
-	rep(/\[li\](.*?)\[\/li\]/gi, '<li>$1</li>');
-	rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>");
-	rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>");
-	rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");
-	rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");
-
-	rep(/\[video\](.*?)\[\/video\]/gi,"<a href=\"$1\">$1</a>");
-	rep(/\[audio\](.*?)\[\/audio\]/gi,"<a href=\"$1\">$1</a>");
-
-	rep(/\[\&amp\;([#a-z0-9]+)\;\]/gi,'&$1;');
-
-	rep(/\<(.*?)(src|href)=\"[^hfm](.*?)\>/gi,'<$1$2="">');
-
-	return y;
-}
-
-function zid(s) {
-	if((! s.length) || (s.indexOf('zid=') != (-1)))
-		return s;
-
-	if(! zid.length)
-		return s;
-
-	var has_params = ((s.indexOf('?') == (-1)) ? false : true);
-	var achar = ((has_params) ? '&' : '?');
-	s = s + achar + 'f=&zid=' + zid;
-
-	return s;
-}
-
 function makeid(length) {
 	var result = '';
 	var characters = 'abcdef0123456789';