implement tiny-OOP routing

5 files changed, 20 insertions, 20 deletions

diff --git a/js/feedlist.js b/js/feedlist.js
index ff4c948d4..75e97e884 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -138,8 +138,8 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
 
 		var toolbar_query = Form.serialize("main_toolbar_form");
 
-		var query = "?op=viewfeed&feed=" + feed + "&" +
-			toolbar_query + "&method=" + param_escape(method);
+		var query = "?op=feeds&method=view&feed=" + feed + "&" +
+			toolbar_query + "&m=" + param_escape(method);
 
 		if (!background) {
 			if (_search_query) {
diff --git a/js/functions.js b/js/functions.js
index e62d576b6..37aa73bc9 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -411,7 +411,7 @@ function displayDlg(id, param, callback) {
 
 	notify_progress("Loading, please wait...", true);
 
-	var query = "?op=dlg&id=" +
+	var query = "?op=dlg&method=" +
 		param_escape(id) + "&param=" + param_escape(param);
 
 	new Ajax.Request("backend.php", {
@@ -846,7 +846,7 @@ function addLabel(select, callback) {
 
 function quickAddFeed() {
 	try {
-		var query = "backend.php?op=dlg&id=quickAddFeed";
+		var query = "backend.php?op=dlg&method=quickAddFeed";
 
 		if (dijit.byId("feedAddDlg"))
 			dijit.byId("feedAddDlg").destroyRecursive();
@@ -948,7 +948,7 @@ function quickAddFeed() {
 
 function quickAddFilter() {
 	try {
-		var query = "backend.php?op=dlg&id=quickAddFilter";
+		var query = "backend.php?op=dlg&method=quickAddFilter";
 
 		if (dijit.byId("filterEditDlg"))
 			dijit.byId("filterEditDlg").destroyRecursive();
@@ -1406,7 +1406,7 @@ function editFeed(feed, event) {
 
 function feedBrowser() {
 	try {
-		var query = "backend.php?op=dlg&id=feedBrowser";
+		var query = "backend.php?op=dlg&method=feedBrowser";
 
 		if (dijit.byId("feedAddDlg"))
 			dijit.byId("feedAddDlg").hide();
@@ -1551,7 +1551,7 @@ function feedBrowser() {
 
 function showFeedsWithErrors() {
 	try {
-		var query = "backend.php?op=dlg&id=feedsWithErrors";
+		var query = "backend.php?op=dlg&method=feedsWithErrors";
 
 		if (dijit.byId("errorFeedsDlg"))
 			dijit.byId("errorFeedsDlg").destroyRecursive();
diff --git a/js/prefs.js b/js/prefs.js
index 760441a3d..98b581ca1 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -1229,7 +1229,7 @@ function editFeedCats() {
 
 function showInactiveFeeds() {
 	try {
-		var query = "backend.php?op=dlg&id=inactiveFeeds";
+		var query = "backend.php?op=dlg&method=inactiveFeeds";
 
 		if (dijit.byId("inactiveFeedsDlg"))
 			dijit.byId("inactiveFeedsDlg").destroyRecursive();
@@ -1470,7 +1470,7 @@ function editProfiles() {
 		if (dijit.byId("profileEditDlg"))
 			dijit.byId("profileEditDlg").destroyRecursive();
 
-		var query = "backend.php?op=dlg&id=editPrefProfiles";
+		var query = "backend.php?op=dlg&method=editPrefProfiles";
 
 		dialog = new dijit.Dialog({
 			id: "profileEditDlg",
@@ -1773,7 +1773,7 @@ function clearTwitterCredentials() {
 
 function customizeCSS() {
 	try {
-		var query = "backend.php?op=dlg&id=customizeCSS";
+		var query = "backend.php?op=dlg&method=customizeCSS";
 
 		if (dijit.byId("cssEditDlg"))
 			dijit.byId("cssEditDlg").destroyRecursive();
@@ -1815,7 +1815,7 @@ function getSelectedInstances() {
 
 function addInstance() {
 	try {
-		var query = "backend.php?op=dlg&id=addInstance";
+		var query = "backend.php?op=dlg&method=addInstance";
 
 		if (dijit.byId("instanceAddDlg"))
 			dijit.byId("instanceAddDlg").destroyRecursive();
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 96147b3d3..38232bdfe 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -222,7 +222,7 @@ function timeout() {
 }
 
 function search() {
-	var query = "backend.php?op=dlg&id=search&param=" +
+	var query = "backend.php?op=dlg&method=search&param=" +
 		param_escape(getActiveFeedId() + ":" + activeFeedIsCat());
 
 	if (dijit.byId("searchDlg"))
@@ -436,7 +436,7 @@ function quickMenuGo(opid) {
 			dialog = new dijit.Dialog({
 				title: __("About..."),
 				style: "width: 400px",
-				href: "backend.php?op=dlg&id=about",
+				href: "backend.php?op=dlg&method=about",
 			});
 
 			dialog.show();
@@ -1078,7 +1078,7 @@ function scheduleFeedUpdate(id, is_cat) {
 
 function newVersionDlg() {
 	try {
-		var query = "backend.php?op=dlg&id=newVersion";
+		var query = "backend.php?op=dlg&method=newVersion";
 
 		if (dijit.byId("newVersionDlg"))
 			dijit.byId("newVersionDlg").destroyRecursive();
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 363121b19..b9b2a8e2b 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -322,7 +322,7 @@ function view(id) {
 
 		hideAuxDlg();
 
-		var query = "?op=view&id=" + param_escape(id);
+		var query = "?op=article&method=view&id=" + param_escape(id);
 
 		var neighbor_ids = getRelativePostIds(id);
 
@@ -1006,7 +1006,7 @@ function catchupSelection() {
 }
 
 function editArticleTags(id) {
-		var query = "backend.php?op=dlg&id=editArticleTags&param=" + param_escape(id);
+		var query = "backend.php?op=dlg&method=editArticleTags&param=" + param_escape(id);
 
 		if (dijit.byId("editTagsDlg"))
 			dijit.byId("editTagsDlg").destroyRecursive();
@@ -1514,7 +1514,7 @@ function emailArticle(id) {
 		if (dijit.byId("emailArticleDlg"))
 			dijit.byId("emailArticleDlg").destroyRecursive();
 
-		var query = "backend.php?op=dlg&id=emailArticle&param=" + param_escape(id);
+		var query = "backend.php?op=dlg&method=emailArticle&param=" + param_escape(id);
 
 		dialog = new dijit.Dialog({
 			id: "emailArticleDlg",
@@ -1770,7 +1770,7 @@ function getLastVisibleHeadlineId() {
 
 function openArticleInNewWindow(id) {
 	toggleUnread(id, 0, false);
-	window.open("backend.php?op=la&id=" + id);
+	window.open("backend.php?op=article&id=" + id);
 }
 
 function isCdmMode() {
@@ -2028,7 +2028,7 @@ function tweetArticle(id) {
 function editArticleNote(id) {
 	try {
 
-		var query = "backend.php?op=dlg&id=editArticleNote&param=" + param_escape(id);
+		var query = "backend.php?op=dlg&method=editArticleNote&param=" + param_escape(id);
 
 		if (dijit.byId("editNoteDlg"))
 			dijit.byId("editNoteDlg").destroyRecursive();
@@ -2227,7 +2227,7 @@ function shareArticle(id) {
 		if (dijit.byId("shareArticleDlg"))
 			dijit.byId("shareArticleDlg").destroyRecursive();
 
-		var query = "backend.php?op=dlg&id=shareArticle&param=" + param_escape(id);
+		var query = "backend.php?op=dlg&method=shareArticle&param=" + param_escape(id);
 
 		dialog = new dijit.Dialog({
 			id: "shareArticleDlg",