diff --git a/app/content/app_config.php b/app/content/app_config.php
deleted file mode 100644
index b5f79ab85b..0000000000
--- a/app/content/app_config.php
+++ /dev/null
@@ -1,414 +0,0 @@
-<?php
-
-	//application details
-		$apps[$x]['name'] = "Content Manager";
-		$apps[$x]['uuid'] = "892c8d0b-bfa5-1bdf-e090-a974da7a7c5e";
-		$apps[$x]['category'] = "System";
-		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "";
-		$apps[$x]['license'] = "Mozilla Public License 1.1";
-		$apps[$x]['url'] = "http://www.fusionpbx.com";
-		$apps[$x]['description']['en-us'] = "Manage Content for any page in the interface.";
-		$apps[$x]['description']['es-cl'] = "Administra el Contenido de cualquier pagina en la interfaz.";
-		$apps[$x]['description']['es-mx'] = "Administra el Contenido de cualquier pagina en la interfaz.";
-		$apps[$x]['description']['de-de'] = "";
-		$apps[$x]['description']['de-ch'] = "";
-		$apps[$x]['description']['de-at'] = "";
-		$apps[$x]['description']['fr-fr'] = "Gerer le contenu des pages de l'interface.";
-		$apps[$x]['description']['fr-ca'] = "Gerer le contenu des pages au interface.";
-		$apps[$x]['description']['fr-ch'] = "";
-		$apps[$x]['description']['pt-pt'] = "Gerir o conteúdo de qualquer página na interface.";
-		$apps[$x]['description']['pt-br'] = "";
-
-	//permission details
-		$apps[$x]['permissions'][0]['name'] = "content_view";
-		$apps[$x]['permissions'][0]['menu']['uuid'] = "90397352-395c-40f6-2087-887144abc06d";
-		$apps[$x]['permissions'][0]['groups'][] = "admin";
-		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][1]['name'] = "content_add";
-		$apps[$x]['permissions'][1]['groups'][] = "admin";
-		$apps[$x]['permissions'][1]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][2]['name'] = "content_edit";
-		$apps[$x]['permissions'][2]['groups'][] = "admin";
-		$apps[$x]['permissions'][2]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][3]['name'] = "content_delete";
-		$apps[$x]['permissions'][3]['groups'][] = "admin";
-		$apps[$x]['permissions'][3]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_view";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_add";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_edit";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_delete";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_sub_view";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_sub_add";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_sub_edit";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_sub_delete";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_sub_category_view";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_sub_category_add";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_sub_category_edit";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "rss_sub_category_delete";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$apps[$x]['permissions'][$y]['groups'][] = "user";
-
-	//schema details
-		$y = 0; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = "v_rss";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
-		//$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][0] = "rssid";
-		//$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][1] = "rss_id";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "rss_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_language";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsslanguage";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_category";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsscategory";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_category";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubcategory";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_title";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsstitle";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_link";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsslink";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_description";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssdesc";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_img";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssimg";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "bytea";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "blob";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "blob";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_optional_1";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssoptional1";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_optional_2";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssoptional2";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_optional_3";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssoptional3";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_optional_4";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssoptional4";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_optional_5";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssoptional5";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_add_date";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssadddate";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_add_user";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssadduser";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_del_date";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssdeldate";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_del_user";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssdeluser";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_order";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssorder";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_content";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsscontent";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_group";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssgroup";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-
-		$y = 1; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = "v_rss_sub";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
-		//$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][0] = "rsssubid";
-		//$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][1] = "rss_sub_id";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "rss_sub_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_id";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssid";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "rss_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_rss";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "rss_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_language";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssublanguage";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_title";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubtitle";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_link";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssublink";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_description";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubdesc";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_optional_1";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssuboptional1";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_optional_2";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssuboptional2";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_optional_3";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssuboptional3";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_optional_4";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssuboptional4";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_optional_5";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssuboptional5";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_add_date";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubadddate";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_add_user";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubadduser";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_del_user";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubdeluser";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_del_date";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubdeldate";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_parent_id";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubparentid";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
-
-		$y = 2; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = "v_rss_sub_category";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
-		//$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][0] = "rsssubcategoryid";
-		//$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][1] = "rss_sub_category_id";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "rss_sub_category_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_category_language";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubcategorylanguage";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_category";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsscategory";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_category";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubcategory";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_category_description";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rsssubcategorydesc";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_add_user";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssadduser";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "rss_sub_add_date";
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "rssadddate";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-
-?>
\ No newline at end of file
diff --git a/app/content/app_languages.php b/app/content/app_languages.php
deleted file mode 100644
index a8a3867b23..0000000000
--- a/app/content/app_languages.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-
-$text['title-rss']['en-us'] = "RSS Feed";
-$text['title-rss']['es-cl'] = "Fuentes RSS";
-$text['title-rss']['pt-pt'] = "RSS Feed";
-$text['title-rss']['fr-fr'] = "RSS Feed";
-$text['title-rss']['pt-br'] = "RSS";
-$text['title-rss']['he'] = "עידכוני מידע";
-$text['title-rss']['pl'] = "RSS Feed";
-$text['title-rss']['uk'] = "RSS Подання";
-$text['title-rss']['sv-se'] = "RSS Flöde";
-
-$text['message-update']['en-us'] = "Update Complete";
-$text['message-update']['es-cl'] = "Actualización Completada";
-$text['message-update']['pt-pt'] = "Actualização Efectuada";
-$text['message-update']['fr-fr'] = "Mis à Jour";
-$text['message-update']['pt-br'] = "Atualização Efetuada";
-$text['message-update']['he'] = "עידכון הושלם";
-$text['message-update']['pl'] = "Zaktualizowano poprawnie";
-$text['message-update']['uk'] = "Оновлення завершено";
-$text['message-update']['sv-se'] = "Uppdatering Klar";
-
-$text['message-item-up']['en-us'] = "Item Moved Up";
-$text['message-item-up']['es-cl'] = "Ítem Ascendido";
-$text['message-item-up']['pt-pt'] = "Item Movido para cima";
-$text['message-item-up']['fr-fr'] = "Objet remonté";
-$text['message-item-up']['pt-br'] = "Mover Item para cima";
-$text['message-item-up']['he'] = "העלה פריט מעלה";
-$text['message-item-up']['pl'] = "Pozycja przeniesiona do góry";
-$text['message-item-up']['uk'] = "Елемент переміщено вгору";
-$text['message-item-up']['sv-se'] = "Raden Flyttades Upp";
-
-$text['message-item-down']['en-us'] = "Item Moved Down";
-$text['message-item-down']['es-cl'] = "Ítem Descendido";
-$text['message-item-down']['pt-pt'] = "Item Movido para baixo";
-$text['message-item-down']['fr-fr'] = "Objet descendu";
-$text['message-item-down']['pt-br'] = "Mover Item para baixo";
-$text['message-item-down']['he'] = "הורד פריט מטה";
-$text['message-item-down']['pl'] = "Pozycja przeniesiona w dół";
-$text['message-item-down']['uk'] = "Елемент переміщено вниз";
-$text['message-item-down']['sv-se'] = "Raden Flyttades Ned";
-
-$text['message-error-missing']['en-us'] = "Error missing";
-$text['message-error-missing']['es-cl'] = "Error perdido";
-$text['message-error-missing']['pt-pt'] = "Error missing";
-$text['message-error-missing']['fr-fr'] = "Erreur missing";
-$text['message-error-missing']['pt-br'] = "Erro fatal";
-$text['message-error-missing']['he'] = "שגיאה חסרה";
-$text['message-error-missing']['pl'] = "Błąd braku ";
-$text['message-error-missing']['uk'] = "Помилка відсутня";
-$text['message-error-missing']['sv-se'] = "Fel Saknas";
-
-$text['message-description']['en-us'] = "Please provide a description.";
-$text['message-description']['es-cl'] = "Por favor ingrese una descripción.";
-$text['message-description']['pt-pt'] = "Por favor indique uma descrição.";
-$text['message-description']['fr-fr'] = "Merci d'écrire une description.";
-$text['message-description']['pt-br'] = "Por favor indique uma descrição";
-$text['message-description']['he'] = "אנא הוסף תיאור";
-$text['message-description']['pl'] = "Wprowadź opis";
-$text['message-description']['uk'] = "Будь ласка, надайте опис.";
-$text['message-description']['sv-se'] = "Ange en beskrivning.";
-
-$text['message-delete-done']['en-us'] = "Delete Completed";
-$text['message-delete-done']['es-cl'] = "Eliminar Completado";
-$text['message-delete-done']['pt-pt'] = "Remoção Efectuada";
-$text['message-delete-done']['fr-fr'] = "Supprimé";
-$text['message-delete-done']['pt-br'] = "Remoção efetuada";
-$text['message-delete-done']['he'] = "מחיקה הושלמה";
-$text['message-delete-done']['pl'] = "Usunięto poprawnie";
-$text['message-delete-done']['uk'] = "Видалено";
-$text['message-delete-done']['sv-se'] = "Radera Utförd";
-
-$text['message-confirm-delete']['en-us'] = "Do you really want to delete this?";
-$text['message-confirm-delete']['es-cl'] = "¿Realmente desea eliminar esto?";
-$text['message-confirm-delete']['pt-pt'] = "Deseja realmente remover isto?";
-$text['message-confirm-delete']['fr-fr'] = "Voulez-vous vraiment faire cela?";
-$text['message-confirm-delete']['pt-br'] = "Deseja realmente remover isto?";
-$text['message-confirm-delete']['he'] = "?האם אתה בטוח שברצונך למחוק זאת";
-$text['message-confirm-delete']['pl'] = "Czy na pewno chcesz to usunąć?";
-$text['message-confirm-delete']['uk'] = "Ви дійсно бажаєте це видалити?";
-$text['message-confirm-delete']['sv-se'] = "Vill du verkligen radera detta?";
-
-$text['message-add']['en-us'] = "Add Complete";
-$text['message-add']['es-cl'] = "Agregar Completado";
-$text['message-add']['pt-pt'] = "Adição Efectuada";
-$text['message-add']['fr-fr'] = "ajouté";
-$text['message-add']['pt-br'] = "Criação efetuada";
-$text['message-add']['he'] = "הוספה הושלמה";
-$text['message-add']['pl'] = "Dodano poprawnie";
-$text['message-add']['uk'] = "Додано";
-$text['message-add']['sv-se'] = "Tillagd";
-
-$text['label-type']['en-us'] = "Type";
-$text['label-type']['es-cl'] = "Tipo";
-$text['label-type']['pt-pt'] = "Tipo";
-$text['label-type']['fr-fr'] = "Type";
-$text['label-type']['pt-br'] = "Tipo";
-$text['label-type']['he'] = "סוג";
-$text['label-type']['pl'] = "Typ";
-$text['label-type']['uk'] = "Тип";
-$text['label-type']['sv-se'] = "Typ";
-
-$text['label-title']['en-us'] = "Title";
-$text['label-title']['es-cl'] = "Título";
-$text['label-title']['pt-pt'] = "Título";
-$text['label-title']['fr-fr'] = "Titre";
-$text['label-title']['pt-br'] = "Título";
-$text['label-title']['he'] = "תאר";
-$text['label-title']['pl'] = "Tytuł";
-$text['label-title']['uk'] = "Назва";
-$text['label-title']['sv-se'] = "Titel";
-
-$text['label-template']['en-us'] = "Template";
-$text['label-template']['es-cl'] = "Plantilla";
-$text['label-template']['pt-pt'] = "Template";
-$text['label-template']['fr-fr'] = "Template";
-$text['label-template']['pt-br'] = "Template";
-$text['label-template']['he'] = "תבנית";
-$text['label-template']['pl'] = "Szablon";
-$text['label-template']['uk'] = "Шаблон";
-$text['label-template']['sv-se'] = "Mall";
-
-$text['label-sub-title']['en-us'] = "Sub Title";
-$text['label-sub-title']['es-cl'] = "Subtítulo";
-$text['label-sub-title']['pt-pt'] = "Sub-Título";
-$text['label-sub-title']['fr-fr'] = "Sous Titre";
-$text['label-sub-title']['pt-br'] = "Sub-Titulo";
-$text['label-sub-title']['he'] = "תת תבנית";
-$text['label-sub-title']['pl'] = "Podtytuł";
-$text['label-sub-title']['uk'] = "Заголовок";
-$text['label-sub-title']['sv-se'] = "Under Titel";
-
-$text['label-sub-link']['en-us'] = "Sub Link";
-$text['label-sub-link']['es-cl'] = "Sub Enlace";
-$text['label-sub-link']['pt-pt'] = "Sub-Link";
-$text['label-sub-link']['fr-fr'] = "Sub Link";
-$text['label-sub-link']['pt-br'] = "Sub-Link";
-$text['label-sub-link']['he'] = "תת קישור";
-$text['label-sub-link']['pl'] = "Sub Link ";
-$text['label-sub-link']['uk'] = "Посилання";
-$text['label-sub-link']['sv-se'] = "Under Länk";
-
-$text['label-sub-id']['en-us'] = "Sub ID";
-$text['label-sub-id']['es-cl'] = "Sub ID";
-$text['label-sub-id']['pt-pt'] = "Sub-ID";
-$text['label-sub-id']['fr-fr'] = "Sous ID";
-$text['label-sub-id']['pt-br'] = "Sub-ID";
-$text['label-sub-id']['he'] = "תת זיהוי";
-$text['label-sub-id']['pl'] = "Sub ID";
-$text['label-sub-id']['uk'] = "ID";
-$text['label-sub-id']['sv-se'] = "Under ID";
-
-$text['label-sub-desc']['en-us'] = "Sub Description";
-$text['label-sub-desc']['es-cl'] = "Sub Descripción";
-$text['label-sub-desc']['pt-pt'] = "Sub-descrição";
-$text['label-sub-desc']['fr-fr'] = "Sub Description";
-$text['label-sub-desc']['pt-br'] = "Sub-Descrição";
-$text['label-sub-desc']['he'] = "תת תיאור";
-$text['label-sub-desc']['pl'] = "Podopis";
-$text['label-sub-desc']['uk'] = "Опис";
-$text['label-sub-desc']['sv-se'] = "Under Beskrivning";
-
-$text['label-sub-category']['en-us'] = "Sub Category";
-$text['label-sub-category']['es-cl'] = "Sub Categoría";
-$text['label-sub-category']['pt-pt'] = "Sub-Categoria";
-$text['label-sub-category']['fr-fr'] = "Sous Categorie";
-$text['label-sub-category']['pt-br'] = "Sub-Categoria";
-$text['label-sub-category']['he'] = "תת קטגוריה";
-$text['label-sub-category']['pl'] = "Podkategoria";
-$text['label-sub-category']['uk'] = "Категорія";
-$text['label-sub-category']['sv-se'] = "Under Kategori";
-
-$text['label-search']['en-us'] = "Search Results";
-$text['label-search']['es-cl'] = "Resultado de la búsqueda";
-$text['label-search']['pt-pt'] = "Resultados da pesquisa";
-$text['label-search']['fr-fr'] = "Resultats de la recherche";
-$text['label-search']['pt-br'] = "Resultados da pequisa";
-$text['label-search']['he'] = "תוצאות חיפוש";
-$text['label-search']['pl'] = "Wyniki wyszukiwania";
-$text['label-search']['uk'] = "Результати пошуку";
-$text['label-search']['sv-se'] = "Sökresultat";
-
-$text['label-rss-category']['en-us'] = "RSS Category";
-$text['label-rss-category']['es-cl'] = "Categoría RSS";
-$text['label-rss-category']['pt-pt'] = "Categoria RSS";
-$text['label-rss-category']['fr-fr'] = "RSS Categorie";
-$text['label-rss-category']['pt-br'] = "Categoria RSS";
-$text['label-rss-category']['he'] = "RSS קטגוריית";
-$text['label-rss-category']['pl'] = "Kategoria RSS";
-$text['label-rss-category']['uk'] = "Категорія RSS";
-$text['label-rss-category']['sv-se'] = "RSS Kategori";
-
-$text['label-order']['en-us'] = "Order";
-$text['label-order']['es-cl'] = "Orden";
-$text['label-order']['pt-pt'] = "Ordem";
-$text['label-order']['fr-fr'] = "Ordre";
-$text['label-order']['pt-br'] = "Ordenação";
-$text['label-order']['he'] = "סדר";
-$text['label-order']['pl'] = "Kolejność";
-$text['label-order']['uk'] = "Інше";
-$text['label-order']['sv-se'] = "Ordning";
-
-$text['label-on-off']['en-us'] = "on/off";
-$text['label-on-off']['es-cl'] = "on/off";
-$text['label-on-off']['pt-pt'] = "on/off";
-$text['label-on-off']['fr-fr'] = "on/off";
-$text['label-on-off']['pt-br'] = "On/Off";
-$text['label-on-off']['he'] = "הדלקֿֿ/כבה";
-$text['label-on-off']['pl'] = "Włączony/wyłączony";
-$text['label-on-off']['uk'] = "увімк./вимкн.";
-$text['label-on-off']['sv-se'] = "på/av";
-
-$text['label-list']['en-us'] = "List";
-$text['label-list']['es-cl'] = "Lista";
-$text['label-list']['pt-pt'] = "Lista";
-$text['label-list']['fr-fr'] = "Liste";
-$text['label-list']['pt-br'] = "Lista";
-$text['label-list']['he'] = "רשימה";
-$text['label-list']['pl'] = "Lista";
-$text['label-list']['uk'] = "Список";
-$text['label-list']['sv-se'] = "Lista";
-
-$text['label-link']['en-us'] = "Link";
-$text['label-link']['es-cl'] = "Enlace";
-$text['label-link']['pt-pt'] = "Link";
-$text['label-link']['fr-fr'] = "Lien";
-$text['label-link']['pt-br'] = "Link";
-$text['label-link']['he'] = "קישור";
-$text['label-link']['pl'] = "Link";
-$text['label-link']['uk'] = "Посилання";
-$text['label-link']['sv-se'] = "Länk";
-
-$text['label-id']['en-us'] = "ID";
-$text['label-id']['es-cl'] = "ID";
-$text['label-id']['pt-pt'] = "ID";
-$text['label-id']['fr-fr'] = "ID";
-$text['label-id']['pt-br'] = "ID";
-$text['label-id']['he'] = "זיהוי";
-$text['label-id']['pl'] = "ID";
-$text['label-id']['uk'] = "ID";
-$text['label-id']['sv-se'] = "ID";
-
-$text['label-group']['en-us'] = "Group";
-$text['label-group']['es-cl'] = "Grupo";
-$text['label-group']['pt-pt'] = "Grupo";
-$text['label-group']['fr-fr'] = "Groupe";
-$text['label-group']['pt-br'] = "Grupo";
-$text['label-group']['he'] = "קבוצה";
-$text['label-group']['pl'] = "Grupa";
-$text['label-group']['uk'] = "Група";
-$text['label-group']['sv-se'] = "Grupp";
-
-$text['label-edit']['en-us'] = "Edit";
-$text['label-edit']['es-cl'] = "Editar";
-$text['label-edit']['pt-pt'] = "Editar";
-$text['label-edit']['fr-fr'] = "Editer";
-$text['label-edit']['pt-br'] = "Editar";
-$text['label-edit']['he'] = "עריכה";
-$text['label-edit']['pl'] = "Edytuj";
-$text['label-edit']['uk'] = "Редагувати";
-$text['label-edit']['sv-se'] = "Redigera";
-
-$text['label-details']['en-us'] = "Details";
-$text['label-details']['es-cl'] = "Detalles";
-$text['label-details']['pt-pt'] = "Detalhes";
-$text['label-details']['fr-fr'] = "Détails";
-$text['label-details']['pt-br'] = "Detalhes";
-$text['label-details']['he'] = "פרטים";
-$text['label-details']['pl'] = "Szczegóły";
-$text['label-details']['uk'] = "Деталі";
-$text['label-details']['sv-se'] = "Detaljer";
-
-$text['label-description']['en-us'] = "Description";
-$text['label-description']['es-cl'] = "Descripción";
-$text['label-description']['pt-pt'] = "Descrição";
-$text['label-description']['fr-fr'] = "Description";
-$text['label-description']['pt-br'] = "Descrição";
-$text['label-description']['he'] = "תיאור";
-$text['label-description']['pl'] = "Opis";
-$text['label-description']['uk'] = "Опис";
-$text['label-description']['sv-se'] = "Beskrivning";
-
-$text['label-content-edit']['en-us'] = "Content";
-$text['label-content-edit']['es-cl'] = "Contenido";
-$text['label-content-edit']['pt-pt'] = "Conteúdo";
-$text['label-content-edit']['fr-fr'] = "Contenu";
-$text['label-content-edit']['pt-br'] = "Conteúdo";
-$text['label-content-edit']['he'] = "תוכן";
-$text['label-content-edit']['pl'] = "Zawartość";
-$text['label-content-edit']['uk'] = "Вміст";
-$text['label-content-edit']['sv-se'] = "Innehåll";
-
-$text['label-content']['en-us'] = "Content";
-$text['label-content']['es-cl'] = "Contenido";
-$text['label-content']['pt-pt'] = "Conteúdo";
-$text['label-content']['fr-fr'] = "Contenu";
-$text['label-content']['pt-br'] = "Conteúdo";
-$text['label-content']['he'] = "תוכן";
-$text['label-content']['pl'] = "Zawartość";
-$text['label-content']['uk'] = "Вміст";
-$text['label-content']['sv-se'] = "Innehåll";
-
-$text['label-category']['en-us'] = "Category";
-$text['label-category']['es-cl'] = "Categoría";
-$text['label-category']['pt-pt'] = "Categoria";
-$text['label-category']['fr-fr'] = "Categorie";
-$text['label-category']['pt-br'] = "Categoria";
-$text['label-category']['he'] = "קטגוריה";
-$text['label-category']['pl'] = "Kategoria";
-$text['label-category']['uk'] = "Категорія";
-$text['label-category']['sv-se'] = "Kategori";
-
-$text['description-rss']['en-us'] = "Task List for RSS...";
-$text['description-rss']['es-cl'] = "Listado de tareas para RSS...";
-$text['description-rss']['pt-pt'] = "Lista de tarefas para RSS...";
-$text['description-rss']['fr-fr'] = "Liste de Tâches pour RSS...";
-$text['description-rss']['pt-br'] = "Lista de tarefas para RSS";
-$text['description-rss']['he'] = "";
-$text['description-rss']['pl'] = "Lista zadań RSS";
-$text['description-rss']['uk'] = "Список завдань для RSS";
-$text['description-rss']['sv-se'] = "Uppgiftslista för RSS...";
-
-$text['button-update']['en-us'] = "Update";
-$text['button-update']['es-cl'] = "Actualizar";
-$text['button-update']['pt-pt'] = "Actualização";
-$text['button-update']['fr-fr'] = "Mise à Jour";
-$text['button-update']['pt-br'] = "Atualização";
-$text['button-update']['he'] = "";
-$text['button-update']['pl'] = "Uaktualnij";
-$text['button-update']['uk'] = "Оновити";
-$text['button-update']['sv-se'] = "Uppdatera";
-
-$text['button-search']['en-us'] = "Search";
-$text['button-search']['es-cl'] = "Buscar";
-$text['button-search']['pt-pt'] = "Pesquisa";
-$text['button-search']['fr-fr'] = "recherche";
-$text['button-search']['pt-br'] = "Pesquisa";
-$text['button-search']['he'] = "";
-$text['button-search']['pl'] = "Wyszukaj";
-$text['button-search']['uk'] = "Пошук";
-$text['button-search']['sv-se'] = "Sök";
-
-$text['button-save']['en-us'] = "Save";
-$text['button-save']['es-cl'] = "Guardar";
-$text['button-save']['pt-pt'] = "Guardar";
-$text['button-save']['fr-fr'] = "Sauvegarde";
-$text['button-save']['pt-br'] = "Salvar";
-$text['button-save']['he'] = "שמור";
-$text['button-save']['pl'] = "Zachowaj";
-$text['button-save']['uk'] = "Зберегти";
-$text['button-save']['sv-se'] = "Spara";
-
-$text['button-public']['en-us'] = "public";
-$text['button-public']['es-cl'] = "público";
-$text['button-public']['pt-pt'] = "público";
-$text['button-public']['fr-fr'] = "public";
-$text['button-public']['pt-br'] = "Público";
-$text['button-public']['he'] = "";
-$text['button-public']['pl'] = "publiczny";
-$text['button-public']['uk'] = "для всіх";
-$text['button-public']['sv-se'] = "allmän";
-
-$text['button-delete']['en-us'] = "Delete";
-$text['button-delete']['es-cl'] = "Eliminar";
-$text['button-delete']['pt-pt'] = "Remover";
-$text['button-delete']['fr-fr'] = "Supprimer";
-$text['button-delete']['pt-br'] = "Remover ";
-$text['button-delete']['he'] = "";
-$text['button-delete']['pl'] = "Usuń";
-$text['button-delete']['uk'] = "Видалити";
-$text['button-delete']['sv-se'] = "Ta Bort";
-
-$text['button-back']['en-us'] = "Back";
-$text['button-back']['es-cl'] = "Volver";
-$text['button-back']['pt-pt'] = "Voltar";
-$text['button-back']['fr-fr'] = "Retour";
-$text['button-back']['pt-br'] = "Voltar";
-$text['button-back']['he'] = "חזרה";
-$text['button-back']['pl'] = "Wróć";
-$text['button-back']['uk'] = "Назад";
-$text['button-back']['sv-se'] = "Tillbaka";
-
-$text['button-add-title']['en-us'] = "Add";
-$text['button-add-title']['es-cl'] = "Agregar";
-$text['button-add-title']['pt-pt'] = "Adicionar";
-$text['button-add-title']['fr-fr'] = "Ajouter";
-$text['button-add-title']['pt-br'] = "Adicionar";
-$text['button-add-title']['he'] = "";
-$text['button-add-title']['pl'] = "Dodaj";
-$text['button-add-title']['uk'] = "Додати";
-$text['button-add-title']['sv-se'] = "Lägg Till";
-
-?>
\ No newline at end of file
diff --git a/app/content/app_menu.php b/app/content/app_menu.php
deleted file mode 100644
index d41aa7bd2e..0000000000
--- a/app/content/app_menu.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$apps[$x]['menu'][0]['title']['en-us'] = "Content Manager";
-$apps[$x]['menu'][0]['title']['es-cl'] = "Gestor de Contenido";
-$apps[$x]['menu'][0]['title']['es-mx'] = "Administrador de Contenido";
-$apps[$x]['menu'][0]['title']['fr-fr'] = "Contenu";
-$apps[$x]['menu'][0]['title']['fr-ca'] = "Administrateur";
-$apps[$x]['menu'][0]['title']['pt-pt'] = "Gestor de Conteúdo";
-$apps[$x]['menu'][0]['title']['pt-br'] = "Gerenciador de Conteúdo";
-$apps[$x]['menu'][0]['title']['he'] = "מנהל תוכן";
-$apps[$x]['menu'][0]['title']['pl'] = "Menedżer zawartości";
-$apps[$x]['menu'][0]['title']['uk'] = "Менеджер вмісту";
-$apps[$x]['menu'][0]['title']['sv-se'] = "Innehålls Inställningar";
-$apps[$x]['menu'][0]['uuid'] = "90397352-395c-40f6-2087-887144abc06d";
-$apps[$x]['menu'][0]['parent_uuid'] = "02194288-6d56-6d3e-0b1a-d53a2bc10788";
-$apps[$x]['menu'][0]['category'] = "internal";
-$apps[$x]['menu'][0]['path'] = "/app/content/rsslist.php";
-$apps[$x]['menu'][0]['groups'][] = "admin";
-$apps[$x]['menu'][0]['groups'][] = "superadmin";
-
-?>
\ No newline at end of file
diff --git a/app/content/config.php b/app/content/config.php
deleted file mode 100644
index 9a8794e676..0000000000
--- a/app/content/config.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-$module_title = 'Content';
-$rss_category = 'content';
-
-$rss_sub_show = 0; //1 = yes, 0 = no
-$rss_sub_title = 'Content';
-?>
\ No newline at end of file
diff --git a/app/content/index.php b/app/content/index.php
deleted file mode 100644
index 0c858ca0da..0000000000
--- a/app/content/index.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-return; //disable
-
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('content_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-require_once "config.php";
-session_start();
-
-require_once "resources/header.php";
-echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"\" href=\"rss.php\" />\n";
-
-$_GET["c"] = "html";
-require_once "rss.php";
-require_once "resources/footer.php";
-
-return;
-?>
diff --git a/app/content/root.php b/app/content/root.php
deleted file mode 100644
index 7b882438ea..0000000000
--- a/app/content/root.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-// make sure the PATH_SEPARATOR is defined
-	if (!defined("PATH_SEPARATOR")) {
-		if ( strpos( $_ENV[ "OS" ], "Win" ) !== false ) { define("PATH_SEPARATOR", ";"); } else { define("PATH_SEPARATOR", ":"); }
-	}
-
-// make sure the document_root is set
-	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", "/", $_SERVER["SCRIPT_FILENAME"]);
-	$_SERVER["DOCUMENT_ROOT"] = str_replace($_SERVER["PHP_SELF"], "", $_SERVER["SCRIPT_FILENAME"]);
-	$_SERVER["DOCUMENT_ROOT"] = realpath($_SERVER["DOCUMENT_ROOT"]);
-	//echo "DOCUMENT_ROOT: ".$_SERVER["DOCUMENT_ROOT"]."<br />\n";
-	//echo "PHP_SELF: ".$_SERVER["PHP_SELF"]."<br />\n";
-	//echo "SCRIPT_FILENAME: ".$_SERVER["SCRIPT_FILENAME"]."<br />\n";
-
-// if the project directory exists then add it to the include path otherwise add the document root to the include path
-	if (is_dir($_SERVER["DOCUMENT_ROOT"].'/fusionpbx')){
-		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', '/fusionpbx'); }
-		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER["DOCUMENT_ROOT"].'/fusionpbx' );
-	}
-	else {
-		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', ''); }
-		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] );
-	}
-
-?>
\ No newline at end of file
diff --git a/app/content/rss.css b/app/content/rss.css
deleted file mode 100644
index cfe4385064..0000000000
--- a/app/content/rss.css
+++ /dev/null
@@ -1,44 +0,0 @@
-rss {
-	display: block;
-	font-family: verdana, arial;
-}
-
-title {
-	display: block;
-	margin: 5px;
-	padding: 2px;
-	color: #77A3EF;
-	border-bottom: 1px solid #77A3EF;
-}
-
-link {
-	display: block;
-	font-size: small;
-	padding-left: 10px;
-}
-
-description {
-	display: block;
-	font-size: small;
-	padding-left: 10px;
-}
-
-item {
-	display: block;
-	padding: 2px 30px 2px 30px;
-}
-
-description {
-	display: block;
-	background-color: #FCFCFC;
-	margin: 20px;
-	text-align: left;
-	padding: 5px;
-	color: #7f7f7f;
-	border: 1px solid #EEEEEE;
-}
-
-/* all hidden elements */
-language, lastBuildDate, ttl, guid, category, pubDate, copyright, webmaster, comments {
-	display: none;
-}
diff --git a/app/content/rss.php b/app/content/rss.php
deleted file mode 100644
index 9f4a8ef801..0000000000
--- a/app/content/rss.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-return; //disable
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-//include module specific information
-if (strlen($mod_config_path)==0) {
-	include "config.php";
-}
-else {
-	//$mod_config_path = "/news"; //examples
-	//$mod_config_path = "/app/news"; //examples
-	include $mod_config_path.'/config.php';
-}
-
-$rss_css_url = 'http://'.$_SERVER["HTTP_HOST"].$_SERVER["PHP_SELF"];
-$rss_css_url = str_replace ("rss.php", "rss.css", $rss_css_url);
-$content_type = $_GET["c"];
-//echo "contenttype $content_type";
-if (strlen($_GET["rss_category"]) > 0) {
-	$rss_category = $_GET["rss_category"];
-}
-if (strlen($content_type) == 0) {
-	$content_type = "rss"; //define default contenttype
-}
-if ($content_type == "html") {
-	session_start();
-}
-//echo $rss_css_url;
-//exit;
-
-if ($content_type == "rss") {
-	header('Content-Type: text/xml');
-	echo '<?xml version="1.0"  ?'.'>';
-	echo '<?xml-stylesheet type="text/css" href="'.$rss_css_url.'" ?'.'>';
-	//echo '<?xml-stylesheet type="text/css" href="http://'.$_SERVER["HTTP_HOST"].$_SERVER["PHP_SELF"].'" ?'.'>';
-	//echo "\n";
-	echo "<rss version=\"2.0\">\n";
-	echo "<channel>\n";
-
-	echo "<title>$module_title ".$text['title-rss']."</title>\n";
-	//echo "<link>http://www.xul.fr/</link>\n";
-	echo "<description>".$text['description-rss']."</description>\n";
-	echo "<language>en-US</language>\n";
-	//echo "<copyright></copyright>\n";
-	//echo "<image>\n";
-	//echo "    <url>http://www.xul.fr/xul-icon.gif</url>\n";
-	//echo "    <link>http://www.xul.fr/index.html</link>\n";
-	//echo "</image>";
-}
-
-$sql = "";
-$sql .= "select * from v_rss ";
-$sql .= "where rss_category = '$rss_category' ";
-$sql .= "and length(rss_del_date) = 0  ";
-$sql .= "or rss_category = '$rss_category' ";
-$sql .= "and rss_del_date is null ";
-$sql .= "order by rss_uuid asc ";
-$prep_statement = $db->prepare(check_sql($sql));
-$prep_statement->execute();
-
-$last_cat = "";
-$count = 0;
-$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-foreach ($result as &$row) {
-
-	$rss_uuid = $row["rss_uuid"];
-	$rss_title = $row["rss_title"];
-	$rss_description = $row["rss_description"];
-	$rss_link = $row["rss_link"];
-
-	//$rss_description = $row[rss_sub_description];
-	//$rss_description = str_replace ("\r\n", "<br>", $rss_description);
-	//$rss_description = str_replace ("\n", "<br>", $rss_description);
-
-	if ($content_type == "rss") {
-		$rss_title = htmlentities($rss_title);
-		$rss_description  = htmlentities($rss_description);
-
-		echo "<item>\n";
-		echo "<title>".$rss_title."</title>\n";
-		echo "<description>".$rss_description."</description>\n";
-		echo "<link>".$rss_link."</link>\n";
-		//echo "<pubDate>12 Mar 2007 19:38:06 GMT</pubDate>\n";
-		//echo "<guid isPermaLink='true'>http://www.google.com/log/123</guid>\n";
-		//echo "<comments>http://www.google.com/log/121#comments</comments>\n";
-		//echo "<category>Web Design</category>";
-		echo "</item>\n";
-		echo "\n";
-
-	}
-	else {
-		if (strlen($rss_link) > 0) {
-			echo "<b><a href='$rss_link'>".$rss_title."</a></b><br>\n";
-		}
-		else {
-			echo "<b>".$rss_title."</b><br>\n";
-		}
-		echo "".$rss_description."\n";
-		echo "<br><br>";
-
-		if ($rss_sub_show == 1) {
-		//--- Begin Sub List -------------------------------------------------------
-
-			echo "<br><br><br>";
-			echo "<b>$rss_sub_title</b><br>";
-
-			$sql = "";
-			$sql .= "select * from v_rss_sub ";
-			$sql .= "where rss_uuid = '$rss_uuid'  ";
-			$sql .= "and length(rss_sub_del_date) = 0  ";
-			$sql .= "or rss_uuid = '$rss_uuid' ";
-			$sql .= "and rss_sub_del_date is null ";
-
-			if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-
-			$prep_statement_2 = $db->prepare($sql);
-			$prep_statement_2->execute();
-			$result2 = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-			$result_count2 = count($result2);
-
-			$c2 = 0;
-			$row_style["0"] = "background-color: #F5F5DC;";
-			$row_style["1"] = "background-color: #FFFFFF;";
-
-			echo "<div align='left'>\n";
-			//echo "      <b>Notes</b>";
-			echo "<table width='75%' border='1' cellpadding='1' cellspacing='1'>\n";
-			//echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>";
-			if ($result_count == 0) { //no results
-				echo "<tr><td>&nbsp;</td></tr>";
-			}
-			else {
-				echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-
-				foreach($result2 as $row2) {
-					echo "<tr style='".$row_style[$c]."'>\n";
-						//echo "<td valign='top'>".$rss_uuid."</td>";
-						//echo "<td valign='top'>&nbsp;<b>".$row2[rss_sub_title]."</b>&nbsp;</td>";
-						//echo "<td valign='top'>&nbsp;".$row2[rss_sub_link]."&nbsp;</td>";
-						echo "<td valign='top' width='200'>";
-						echo "  <b>".$row2[rss_sub_title]."</b>";
-						echo "</td>";
-
-						echo "<td valign='top'>".$row2[rss_sub_add_date]."</td>";
-
-						//echo "<td valign='top'>".$row2[rss_sub_optional_1]."</td>";
-						//echo "<td valign='top'>".$row2[rss_sub_optional_2]."</td>";
-						//echo "<td valign='top'>".$row2[rss_sub_optional_3]."</td>";
-						//echo "<td valign='top'>".$row2[rss_sub_optional_4]."</td>";
-						//echo "<td valign='top'>".$row2[rss_sub_optional_5]."</td>";
-						//echo "<td valign='top'>".$row2[rss_sub_add_user]."</td>";
-						echo "<td valign='top' align='right'>";
-						echo "  &nbsp;";
-						//echo "  <input type='button' class='btn' name='' onclick=\"window.location='rsssubupdate.php?rss_uuid=".$rss_uuid."&rss_sub_uuid=".$row2[rss_sub_uuid]."'\" value='Update'>";
-						echo "  &nbsp; \n";
-						//echo "  <a href='rsssubupdate.php?rss_uuid=".$rss_uuid."&rss_sub_uuid=".$row2[rss_sub_uuid]."'>Update</a>&nbsp;";
-						echo "</td>";
-
-						$rss_sub_description = $row2[rss_sub_description];
-						//$rss_sub_description = str_replace ("\r\n", "<br>", $rss_sub_description);
-						//$rss_sub_description = str_replace ("\n", "<br>", $rss_sub_description);
-
-
-						echo "</tr>";
-						echo "<tr style='".$row_style[$c]."'>\n";
-						echo "<td valign='top' width='300' colspan='3'>";
-						echo "".$rss_sub_description."&nbsp;";
-						echo "</td>";
-
-					echo "</tr>";
-
-					echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-					if ($c2==0) { $c2=1; } else { $c2=0; }
-				} //end foreach
-				unset($sql, $result, $row_count);
-
-				echo "</table>\n";
-				echo "</div>\n";
-
-
-				echo "  <br><br>";
-				echo "  </td>\n";
-				echo "</tr>\n";
-
-			} //end if results
-
-			echo "</table>\n";
-		//--- End Sub List -------------------------------------------------------
-		}
-	}
-
-
-	//echo "<item>\n";
-	//echo "<title>    ".$row["favname"]."</title>\n";
-	//echo "<description>".$row["favdesc"]."</description>\n";
-	//echo "<link>".$row["favurl"]."</link>\n";
-	//echo "</item>\n";
-
-	//$last_cat = $row["favcat"];
-	$count++;
-
-}
-
-if ($content_type == "rss") {
-	echo "</channel>\n";
-	echo "\n";
-	echo "</rss>\n";
-}
-
-?>
\ No newline at end of file
diff --git a/app/content/rssadd.php b/app/content/rssadd.php
deleted file mode 100644
index 7acef7ec9b..0000000000
--- a/app/content/rssadd.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_add')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-if (count($_POST)>0) {
-
-	//get the http values and set them as variables
-		$rss_sub_category = check_str($_POST["rss_sub_category"]);
-		$rss_title = check_str($_POST["rss_title"]);
-		$rss_link = check_str($_POST["rss_link"]);
-		$rss_description = check_str($_POST["rss_description"]);
-		$rss_img = check_str($_POST["rss_img"]);
-		$rss_optional_1 = check_str($_POST["rss_optional_1"]);
-		$rss_optional_2 = check_str($_POST["rss_optional_2"]);
-		$rss_optional_3 = check_str($_POST["rss_optional_3"]);
-		$rss_optional_4 = check_str($_POST["rss_optional_4"]);
-		$rss_optional_5 = check_str($_POST["rss_optional_5"]);
-		$rss_group = check_str($_POST["rss_group"]);
-		$rss_order = check_str($_POST["rss_order"]);
-
-	//insert the data into the database
-		$rss_uuid = uuid();
-		$sql = "insert into v_rss ";
-		$sql .= "(";
-		$sql .= "domain_uuid, ";
-		$sql .= "rss_uuid, ";
-		$sql .= "rss_category, ";
-		$sql .= "rss_sub_category, ";
-		$sql .= "rss_title, ";
-		$sql .= "rss_link, ";
-		$sql .= "rss_description, ";
-		$sql .= "rss_img, ";
-		$sql .= "rss_optional_1, ";
-		$sql .= "rss_optional_2, ";
-		$sql .= "rss_optional_3, ";
-		$sql .= "rss_optional_4, ";
-		$sql .= "rss_optional_5, ";
-		$sql .= "rss_group, ";
-		$sql .= "rss_order, ";
-		$sql .= "rss_add_date, ";
-		$sql .= "rss_add_user ";
-		$sql .= ")";
-		$sql .= "values ";
-		$sql .= "(";
-		$sql .= "'$domain_uuid', ";
-		$sql .= "'$rss_uuid', ";
-		$sql .= "'$rss_category', ";
-		$sql .= "'$rss_sub_category', ";
-		$sql .= "'$rss_title', ";
-		$sql .= "'$rss_link', ";
-		$sql .= "'$rss_description', ";
-		$sql .= "'$rss_img', ";
-		$sql .= "'$rss_optional_1', ";
-		$sql .= "'$rss_optional_2', ";
-		$sql .= "'$rss_optional_3', ";
-		$sql .= "'$rss_optional_4', ";
-		$sql .= "'$rss_optional_5', ";
-		$sql .= "'$rss_group', ";
-		$sql .= "'$rss_order', ";
-		$sql .= "now(), ";
-		$sql .= "'".$_SESSION["username"]."' ";
-		$sql .= ")";
-		$db->exec(check_sql($sql));
-		unset($sql);
-
-	$_SESSION["message"] = $text['message-add'];
-	header("Location: rsslist.php");
-	return;
-}
-
-	require_once "resources/header.php";
-	if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/tiny_mce')) {
-		if ($rss_optional_1 == "text/html") {
-			require_once "resources/wysiwyg.php";
-		}
-	}
-	else {
-		//--- Begin: Edit Area -----------------------------------------------------
-			echo "    <script language=\"javascript\" type=\"text/javascript\" src=\"".PROJECT_PATH."/resources/edit_area/edit_area_full.js\"></script>\n";
-			echo "    <!-- -->\n";
-
-			echo "	<script language=\"Javascript\" type=\"text/javascript\">\n";
-			echo "		editAreaLoader.init({\n";
-			echo "			id: \"rss_description\" // id of the textarea to transform //, |, help\n";
-			echo "			,start_highlight: true\n";
-			echo "			,font_size: \"8\"\n";
-			echo "			,allow_toggle: false\n";
-			echo "			,language: \"en\"\n";
-			echo "			,syntax: \"html\"\n";
-			echo "			,toolbar: \"search, go_to_line,|, fullscreen, |, undo, redo, |, select_font, |, syntax_selection, |, change_smooth_selection, highlight, reset_highlight, |, help\" //new_document,\n";
-			echo "			,plugins: \"charmap\"\n";
-			echo "			,charmap_default: \"arrows\"\n";
-			echo "    });\n";
-			echo "    </script>";
-		//--- End: Edit Area -------------------------------------------------------
-	}
-
-	echo "<form method='post' action=''>";
-	echo "<table width='100%' cellpadding='0' cellspacing='0'>";
-
-	echo "<tr>\n";
-	echo "<td width='30%' nowrap valign='top'><b>Content Add</b></td>\n";
-	echo "<td width='70%' align='right' valign='top'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='rsslist.php'\" value='".$text['button-back']."'><br /><br /></td>\n";
-	echo "</tr>\n";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Category</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_category' value='$rss_category'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq' nowrap>Sub Category</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_sub_category' value='$rss_sub_category'></td>";
-	//echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td width='30%' class='vncellreq' nowrap>Title</td>";
-	echo "		<td width='70%' class='vtable' width='100%'><input type='text' class='formfld' name='rss_title' value='$rss_title'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td class='vncellreq'>Link</td>";
-	echo "		<td class='vtable'><input type='text' class='formfld' name='rss_link' value='$rss_link'></td>";
-	echo "	</tr>";
-
-	echo "	<tr>";
-	echo "		<td class='vncellreq'>Group</td>";
-	echo "		<td class='vtable'>";
-	//echo "            <input type='text' class='formfld' name='menuparentid' value='$menuparentid'>";
-
-	//---- Begin Select List --------------------
-	$sql = "SELECT * FROM v_groups ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "order by group_name asc ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-
-	echo "<select name=\"rss_group\" class='formfld'>\n";
-	echo "<option value=\"\">".$text['button-public']."</option>\n";
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	//$count = count($result);
-	foreach($result as $field) {
-			if ($rss_group == $field[group_name]) {
-				echo "<option value='".$field[group_name]."' selected>".$field[group_name]."</option>\n";
-			}
-			else {
-				echo "<option value='".$field[group_name]."'>".$field[group_name]."</option>\n";
-			}
-	}
-
-	echo "</select>";
-	unset($sql, $result);
-	//---- End Select List --------------------
-
-	echo "        </td>";
-	echo "	</tr>";
-
-	/*
-	echo "	<tr>\n";
-	echo "	<td width='20%' class=\"vncell\" style='text-align: left;'>\n";
-	echo "		Template: \n";
-	echo "	</td>\n";
-	echo "	<td class=\"vtable\">\n";
-	echo "<select id='rss_sub_category' name='rss_sub_category' class='formfld' style=''>\n";
-	echo "<option value=''></option>\n";
-	$theme_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes';
-	if ($handle = opendir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes')) {
-		while (false !== ($file = readdir($handle))) {
-			if ($file != "." && $file != ".." && $file != ".svn" && is_dir($theme_dir.'/'.$file)) {
-				if ($file == $rss_sub_category) {
-					echo "<option value='$file' selected='selected'>$file</option>\n";
-				}
-				else {
-					echo "<option value='$file'>$file</option>\n";
-				}
-			}
-		}
-		closedir($handle);
-	}
-	echo "	</select>\n";
-	echo "	<br />\n";
-	echo "	Select a template to set as the default and then press save.<br />\n";
-	echo "	</td>\n";
-	echo "	</tr>\n";
-	*/
-
-	echo "	<tr>";
-	echo "		<td class='vncellreq'>Type</td>";
-	echo "		<td class='vtable'>";
-	echo "            <select name=\"rss_optional_1\" class='formfld'>\n";
-	if ($rss_optional_1 == "text/html") { echo "<option value=\"text/html\" selected>text/html</option>\n"; }
-	else { echo "<option value=\"text/html\">text/html</option>\n"; }
-
-	if ($rss_optional_1 == "text/javascript") { echo "<option value=\"text/javascript\" selected>text/javascript</option>\n"; }
-	else { echo "<option value=\"text/javascript\">text/javascript</option>\n"; }
-	echo "            </select>";
-	echo "        </td>";
-	echo "	</tr>";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "    ".$text['label-order']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "              <select name='rss_order' class='formfld'>\n";
-	if (strlen(htmlspecialchars($rss_order))> 0) {
-		echo "              <option selected='yes' value='".htmlspecialchars($rss_order)."'>".htmlspecialchars($rss_order)."</option>\n";
-	}
-	$i=0;
-	while($i<=999) {
-		if (strlen($i) == 1) {
-			echo "              <option value='00$i'>00$i</option>\n";
-		}
-		if (strlen($i) == 2) {
-			echo "              <option value='0$i'>0$i</option>\n";
-		}
-		if (strlen($i) == 3) {
-			echo "              <option value='$i'>$i</option>\n";
-		}
-		$i++;
-	}
-	echo "              </select>\n";
-	echo "<br />\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "	<tr>";
-	//echo "		<td  class='vncellreq' valign='top'></td>";
-	echo "		<td  class='' colspan='2' align='left'>";
-	echo "            <strong>".$text['label-content'].":</strong> ";
-	if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/tiny_mce')) {
-		echo "            &nbsp; &nbsp; &nbsp; editor &nbsp; <a href='#' title='toggle' onclick=\"toogleEditorMode('rss_description'); return false;\">".$text['label-on-off']."</a><br>";
-	}
-	else {
-		echo "            <textarea name='rss_description'  id='rss_description' class='formfld' cols='20' style='width: 100%' rows='12' ></textarea>";
-	}
-	echo "        </td>";
-	echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Image</td>";
-	//echo "		<td class='vtable'><input type='text' name='rss_img' value='$rss_img'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Priority</td>";
-	//echo "		<td class='vtable'>";
-	//echo "            <input type='text' name='rss_optional_1' value='$rss_optional_1'>";
-	//echo "            <select name=\"rss_optional_1\" class='formfld'>\n";
-	//echo "            <option value=\"$rss_optional_1\">$rss_optional_1</option>\n";
-	//echo "            <option value=\"\"></option>\n";
-	//echo "            <option value=\"low\">low</option>\n";
-	//echo "            <option value=\"med\">med</option>\n";
-	//echo "            <option value=\"high\">high</option>\n";
-	//echo "            </select>";
-	//echo "        </td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Status</td>";
-	//echo "		<td class='vtable'>";
-	//echo "            <input type='text' name='rss_optional_2' value='$rss_optional_2'>";
-	//echo "            <select name=\"rss_optional_2\" class=\"formfld\">\n";
-	//echo "            <option value=\"$rss_optional_2\">$rss_optional_2</option>\n";
-	//echo "            <option value=\"\"></option>\n";
-	//echo "            <option value=\"0\">0</option>\n";
-	//echo "            <option value=\"10\">10</option>\n";
-	//echo "            <option value=\"20\">20</option>\n";
-	//echo "            <option value=\"30\">30</option>\n";
-	//echo "            <option value=\"40\">40</option>\n";
-	//echo "            <option value=\"50\">50</option>\n";
-	//echo "            <option value=\"60\">60</option>\n";
-	//echo "            <option value=\"70\">70</option>\n";
-	//echo "            <option value=\"80\">80</option>\n";
-	//echo "            <option value=\"90\">90</option>\n";
-	//echo "            <option value=\"100\">100</option>\n";
-	//echo "            </select>";
-	//echo "        </td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Optional 3</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_optional_3' value='$rss_optional_3'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Optional 4</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_optional_4' value='$rss_optional_4'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>rss_optional_5</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_optional_5' value='$rss_optional_5'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>rss_add_date</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_add_date' value='$rss_add_date'></td>";
-	//echo "	</tr>";
-
-	echo "	<tr>";
-	echo "		<td class='' colspan='2' align='right'>";
-	echo "			<br><br>";
-	echo "          <input type='submit' class='btn' name='submit' value='".$text['button-add-title']." $module_title'>\n";
-	echo "      </td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "<br><br>";
-	echo "</form>";
-
-
-require_once "resources/footer.php";
-?>
diff --git a/app/content/rsscontent.php b/app/content/rsscontent.php
deleted file mode 100644
index 9ff3c3aa04..0000000000
--- a/app/content/rsscontent.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-
-//get data from the db
-$rss_uuid = $_REQUEST["rss_uuid"];
-
-$sql = "";
-$sql .= "select * from v_rss ";
-$sql .= "where domain_uuid = '$domain_uuid' ";
-$sql .= "and rss_uuid = '$rss_uuid' ";
-//echo $sql;
-$prep_statement = $db->prepare(check_sql($sql));
-$prep_statement->execute();
-$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-foreach ($result as &$row) {
-	$rss_category = $row["rss_category"];
-	$rss_sub_category = $row["rss_sub_category"];
-	$rss_title = $row["rss_title"];
-	$rss_link = $row["rss_link"];
-	$rss_description = $row["rss_description"];
-	$rss_img = $row["rss_img"];
-	$rss_optional_1 = $row["rss_optional_1"];
-	$rss_optional_2 = $row["rss_optional_2"];
-	$rss_optional_3 = $row["rss_optional_3"];
-	$rss_optional_4 = $row["rss_optional_4"];
-	$rss_optional_5 = $row["rss_optional_5"];
-	$rss_add_date = $row["rss_add_date"];
-	$rss_add_user = $row["rss_add_user"];
-	$rss_group = $row["rss_group"];
-	$rss_order = $row["rss_order"];
-	//$rss_description = str_replace ("\r\n", "<br>", $rss_description);
-
-	echo $rss_description;
-	//return;
-
-	break; //limit to 1 row
-}
-
-?>
diff --git a/app/content/rssdelete.php b/app/content/rssdelete.php
deleted file mode 100644
index d06ba85ab3..0000000000
--- a/app/content/rssdelete.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_delete')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-if (count($_GET)>0) {
-	$rss_uuid = check_str($_GET["rss_uuid"]);
-
-	//mark the the item as deleted and who deleted it
-	$sql  = "update v_rss set ";
-	$sql .= "rss_del_date = now(), ";
-	$sql .= "rss_del_user = '".$_SESSION["username"]."' ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and rss_uuid = '$rss_uuid' ";
-	$sql .= "and rss_category  = '$rss_category' ";
-	$db->exec(check_sql($sql));
-	unset($sql);
-
-	$_SESSION["message"] = $text['message-delete-done'];
-	header("Location: rsslist.php?rss_uuid=".$rss_uuid);
-	return;
-}
-
-
-?>
diff --git a/app/content/rsslist.php b/app/content/rsslist.php
deleted file mode 100644
index 7a3acdd31b..0000000000
--- a/app/content/rsslist.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-require_once "resources/header.php";
-echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"\" href=\"rss.php\" />\n";
-
-$order_by = $_GET["order_by"];
-$order = $_GET["order"];
-
-
-	echo "<table width='100%'>";
-	echo "<tr>";
-	echo "<td align='left'>";
-	echo "      <b>$module_title ".$text['label-list']."</b>";
-	echo "</td>";
-	echo "<td align='right'>";
-	//echo "      <input type='button' class='btn' name='' onclick=\"window.location='rssadd.php'\" value='Add $module_title'>&nbsp; &nbsp;\n";
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-
-	$sql = "";
-	$sql .= "select * from v_rss ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and rss_category = '$rss_category' ";
-	$sql .= "and length(rss_del_date) = 0 ";
-	$sql .= "or domain_uuid = '$domain_uuid' ";
-	$sql .= "and rss_category = '$rss_category' ";
-	$sql .= "and rss_del_date is null ";
-	if (strlen($order_by)> 0) {
-		$sql .= "order by $order_by $order ";
-	}
-	else {
-		$sql .= "order by rss_order asc ";
-	}
-	//echo $sql;
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	$result_count = count($result);
-
-	$c = 0;
-	$row_style["0"] = "row_style0";
-	$row_style["1"] = "row_style1";
-
-	echo "<table class='tr_hover' width='100%' border='0' cellpadding='2' cellspacing='0'>\n";
-	echo "<tr>";
-	echo th_order_by('rss_title', $text['label-title'], $order_by, $order);
-	echo th_order_by('rss_link', $text['label-link'], $order_by, $order);
-	//echo th_order_by('rss_sub_category', 'Template', $order_by, $order);
-	echo th_order_by('rss_group', $text['label-group'], $order_by, $order);
-	echo th_order_by('rss_order', $text['label-order'], $order_by, $order, '', "style='text-align: center;'");
-	if ($result_count == 0) { //no results
-		echo "<td class='list_control_icons'>\n";
-	}
-	else {
-		echo "<td class='list_control_icons'>\n";
-	}
-	echo "	<a href='rssadd.php' alt='add'>$v_link_label_add</a>\n";
-	echo "</td>\n";
-	echo "</tr>";
-
-	if ($result_count > 0) {
-		foreach($result as $row) {
-		//print_r( $row );
-			$tr_link = "href='rssupdate.php?rss_uuid=".$row[rss_uuid]."'";
-			echo "<tr ".$tr_link.">\n";
-				//echo "<td valign='top'><a href='rssupdate.php?rss_uuid=".$row[rss_uuid]."'>".$row[rss_uuid]."</a></td>";
-				//echo "<td valign='top'>".$row[rss_category]."</td>";
-
-				echo "<td valign='top' nowrap class='".$row_style[$c]."'><a href='rssupdate.php?rss_uuid=".$row[rss_uuid]."'>".$row[rss_title]."</a></td>";
-				echo "<td valign='top' nowrap class='".$row_style[$c]."'><a href='/index.php?c=".$row[rss_link]."'>".$row[rss_link]."</a></td>";
-				//echo "<td valign='top' class='".$row_style[$c]."'>".$row[rss_sub_category]."&nbsp;</td>";
-				if (strlen($row[rss_group]) > 0) {
-					echo "<td valign='top' class='".$row_style[$c]."'>".$row[rss_group]."</td>";
-				}
-				else {
-					echo "<td valign='top' class='".$row_style[$c]."'>public</td>";
-				}
-
-				//echo "<td valign='top'>".$row[rss_description]."</td>";
-				//echo "<td valign='top'>".$row[rss_img]."</td>";
-				//echo "<td valign='top'>&nbsp;".$row[rss_optional_1]."&nbsp;</td>"; //priority
-
-				//echo "<td valign='top' class='".$row_style[$c]."'>&nbsp;";
-				//sif ($row[rss_optional_2]=="100") {
-				//    echo "Complete";
-				//}
-				//else {
-				//    echo $row[rss_optional_2]."%";
-				//}
-				//echo "&nbsp;</td>"; //completion status
-
-				//echo "<td valign='top'>".$row[rss_optional_3]."</td>";
-				//echo "<td valign='top'>".$row[rss_optional_4]."</td>";
-				//echo "<td valign='top'>".$row[rss_optional_5]."</td>";
-				echo "<td valign='top' class='".$row_style[$c]."' style='text-align: center;'>".$row[rss_order]."</td>";
-
-				//echo "<td valign='top' align='center'>";
-				//echo "  <input type='button' class='btn' name='' onclick=\"window.location='rssmoveup.php?menuparentid=".$row[menuparentid]."&rss_uuid=".$row[rss_uuid]."&rss_order=".$row[rss_order]."'\" value='<' title='".$row[rss_order].". Move Up'>";
-				//echo "  <input type='button' class='btn' name='' onclick=\"window.location='rssmovedown.php?menuparentid=".$row[menuparentid]."&rss_uuid=".$row[rss_uuid]."&rss_order=".$row[rss_order]."'\" value='>' title='".$row[rss_order].". Move Down'>";
-				//echo "</td>";
-
-				echo "	<td class='list_control_icons'>";
-				echo "<a href='rssupdate.php?rss_uuid=".$row[rss_uuid]."' alt='".$text['label-edit']."'>$v_link_label_edit</a>";
-				echo "<a href='rssdelete.php?rss_uuid=".$row[rss_uuid]."' alt='delete' onclick=\"return confirm('".$text['message-confirm-delete']."')\">$v_link_label_delete</a>";
-				echo "</td>\n";
-
-				//echo "<td valign='top' align='right' class='".$row_style[$c]."'>";
-				//echo "  <input type='button' class='btn' name='' onclick=\"if (confirm('Are you sure you wish to continue?')) { window.location='rssdelete.php?rss_uuid=".$row[rss_uuid]."' }\" value='Delete'>";
-				//echo "</td>";
-
-			echo "</tr>";
-
-			if ($c==0) { $c=1; } else { $c=0; }
-		} //end foreach
-		unset($sql, $result, $row_count);
-
-	} //end if results
-
-	echo "<tr>\n";
-	echo "<td colspan='6' align='left'>\n";
-
-	echo "	<table border='0' width='100%' cellpadding='0' cellspacing='0'>\n";
-	echo "	<tr>\n";
-	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
-	echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
-	echo "		<td class='list_control_icons'>\n";
-	echo "			<a href='rssadd.php' alt='add'>$v_link_label_add</a>\n";
-	echo "		</td>\n";
-	echo "	</tr>\n";
-	echo "	</table>\n";
-
-	echo "</td>\n";
-	echo "</tr>\n";
-	echo "</table>\n";
-	echo "<br><br>";
-
-	//echo "<input type='button' class='btn' name='' onclick=\"window.location='rsssearch.php'\" value='Search'>&nbsp; &nbsp;\n";
-	//echo "<input type='button' class='btn' name='' onclick=\"window.location='rssadd.php'\" value='Add $module_title'>&nbsp; &nbsp;\n";
-
-	require_once "resources/footer.php";
-
-	unset ($result_count);
-	unset ($result);
-	unset ($key);
-	unset ($val);
-	unset ($c);
-
-?>
diff --git a/app/content/rssmovedown.php b/app/content/rssmovedown.php
deleted file mode 100644
index b2b650f03f..0000000000
--- a/app/content/rssmovedown.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_edit')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-//move down more than one level at a time
-//update v_rss set rss_order = (rss_order+1) where rss_order > 2 or rss_order = 2
-
-if (count($_GET)>0) {
-	$rss_uuid = check_str($_GET["rss_uuid"]);
-	$rss_order = check_str($_GET["rss_order"]);
-
-	$sql = "SELECT rss_order FROM v_rss ";
-	$sql .= "where domain_uuid  = '$domain_uuid' ";
-	$sql .= "and rss_category  = '$rss_category' ";
-	$sql .= "order by rss_order desc ";
-	$sql .= "limit 1 ";
-	//echo $sql."<br><br>";
-	//return;
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	foreach ($result as &$row) {
-		//print_r( $row );
-		$highestrss_order = $row[rss_order];
-	}
-	unset($prep_statement);
-
-	if ($rss_order != $highestrss_order) {
-		//move the current item's order number up
-		$sql  = "update v_rss set ";
-		$sql .= "rss_order = (rss_order-1) "; //move down
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and rss_order = ".($rss_order+1)." ";
-		$sql .= "and rss_category  = '$rss_category' ";
-		//echo $sql."<br><br>";
-		$db->exec(check_sql($sql));
-		unset($sql);
-
-		//move the selected item's order number down
-		$sql  = "update v_rss set ";
-		$sql .= "rss_order = (rss_order+1) "; //move up
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and rss_uuid = '$rss_uuid' ";
-		$sql .= "and rss_category  = '$rss_category' ";
-		//echo $sql."<br><br>";
-		$db->exec(check_sql($sql));
-		unset($sql);
-	}
-
-	$_SESSION["message"] = $text['message-item-down'];
-	header("Location: rsslist.php?rss_uuid=".$rss_uuid);
-	return;
-}
-
-
-?>
diff --git a/app/content/rssmoveup.php b/app/content/rssmoveup.php
deleted file mode 100644
index 3eb5bd798b..0000000000
--- a/app/content/rssmoveup.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-//move down more than one level at a time
-//update v_rss set rss_order = (rss_order+1) where rss_order > 2 or rss_order = 2
-
-if (count($_GET)>0) {
-	$rss_uuid = check_str($_GET["rss_uuid"]);
-	$rss_order = check_str($_GET["rss_order"]);
-	if ($rss_order != 1) {
-		//move the current item's order number down
-		$sql  = "update v_rss set ";
-		$sql .= "rss_order = (rss_order+1) "; //move down
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and rss_order = ".($rss_order-1)." ";
-		$sql .= "and rss_category  = '$rss_category' ";
-		//echo $sql."<br><br>";
-		$db->exec(check_sql($sql));
-		unset($sql);
-
-
-		//move the selected item's order number up
-		$sql  = "update v_rss set ";
-		$sql .= "rss_order = (rss_order-1) "; //move up
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and rss_uuid = '$rss_uuid' ";
-		$sql .= "and rss_category  = '$rss_category' ";
-		//echo $sql."<br><br>";
-		$db->exec(check_sql($sql));
-		unset($sql);
-	}
-
-	$_SESSION["message"] = $text['message-item-up'];
-	header("Location: rsslist.php?rss_uuid=".$rss_uuid);
-	return;
-}
-
-
-?>
diff --git a/app/content/rsssearch.php b/app/content/rsssearch.php
deleted file mode 100644
index 4298ba41ff..0000000000
--- a/app/content/rsssearch.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-return; //disabled
-
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-if (count($_POST)>0) {
-	$rss_uuid = check_str($_POST["rss_uuid"]);
-	//$rss_category = check_str($_POST["rss_category"]); //defined in local config.php
-	$rss_sub_category = check_str($_POST["rss_sub_category"]);
-	$rss_title = check_str($_POST["rss_title"]);
-	$rss_link = check_str($_POST["rss_link"]);
-	$rss_description = check_str($_POST["rss_description"]);
-	$rss_img = check_str($_POST["rss_img"]);
-	$rss_optional_1 = check_str($_POST["rss_optional_1"]);
-	$rss_optional_2 = check_str($_POST["rss_optional_2"]);
-	$rss_optional_3 = check_str($_POST["rss_optional_3"]);
-	$rss_optional_4 = check_str($_POST["rss_optional_4"]);
-	$rss_optional_5 = check_str($_POST["rss_optional_5"]);
-	$rss_add_date = check_str($_POST["rss_add_date"]);
-	$rss_add_user = check_str($_POST["rss_add_user"]);
-
-	require_once "resources/header.php";
-
-
-
-	echo "<div align='center'>";
-	echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
-
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"left\">\n";
-	echo "      <br>";
-
-
-	$sql = "";
-	$sql .= "select * from v_rss ";
-	$sql .= "where ";
-	if (strlen($rss_uuid) > 0) { $sql .= "and rss_uuid like '%$rss_uuid%' "; }
-	if (strlen($rss_category) > 0) { $sql .= "and rss_category like '%$rss_category%' "; }
-	if (strlen($rss_sub_category) > 0) { $sql .= "and rss_sub_category like '%$rss_sub_category%' "; }
-	if (strlen($rss_title) > 0) { $sql .= "and rss_title like '%$rss_title%' "; }
-	if (strlen($rss_link) > 0) { $sql .= "and rss_link like '%$rss_link%' "; }
-	if (strlen($rss_description) > 0) { $sql .= "and rss_description like '%$rss_description%' "; }
-	if (strlen($rss_img) > 0) { $sql .= "and rss_img like '%$rss_img%' "; }
-	if (strlen($rss_optional_1) > 0) { $sql .= "and rss_optional_1 like '%$rss_optional_1%' "; }
-	if (strlen($rss_optional_2) > 0) { $sql .= "and rss_optional_2 like '%$rss_optional_2%' "; }
-	if (strlen($rss_optional_3) > 0) { $sql .= "and rss_optional_3 like '%$rss_optional_3%' "; }
-	if (strlen($rss_optional_4) > 0) { $sql .= "and rss_optional_4 like '%$rss_optional_4%' "; }
-	if (strlen($rss_optional_5) > 0) { $sql .= "and rss_optional_5 like '%$rss_optional_5%' "; }
-	if (strlen($rss_add_date) > 0) { $sql .= "and rss_add_date like '%$rss_add_date%' "; }
-	if (strlen($rss_add_user) > 0) { $sql .= "and rss_add_user like '%$rss_add_user%' "; }
-	$sql .= "and length(rss_del_date) = 0 ";
-	$sql .= "or ";
-	if (strlen($rss_uuid) > 0) { $sql .= "and rss_uuid like '%$rss_uuid%' "; }
-	if (strlen($rss_category) > 0) { $sql .= "and rss_category like '%$rss_category%' "; }
-	if (strlen($rss_sub_category) > 0) { $sql .= "and rss_sub_category like '%$rss_sub_category%' "; }
-	if (strlen($rss_title) > 0) { $sql .= "and rss_title like '%$rss_title%' "; }
-	if (strlen($rss_link) > 0) { $sql .= "and rss_link like '%$rss_link%' "; }
-	if (strlen($rss_description) > 0) { $sql .= "and rss_description like '%$rss_description%' "; }
-	if (strlen($rss_img) > 0) { $sql .= "and rss_img like '%$rss_img%' "; }
-	if (strlen($rss_optional_1) > 0) { $sql .= "and rss_optional_1 like '%$rss_optional_1%' "; }
-	if (strlen($rss_optional_2) > 0) { $sql .= "and rss_optional_2 like '%$rss_optional_2%' "; }
-	if (strlen($rss_optional_3) > 0) { $sql .= "and rss_optional_3 like '%$rss_optional_3%' "; }
-	if (strlen($rss_optional_4) > 0) { $sql .= "and rss_optional_4 like '%$rss_optional_4%' "; }
-	if (strlen($rss_optional_5) > 0) { $sql .= "and rss_optional_5 like '%$rss_optional_5%' "; }
-	if (strlen($rss_add_date) > 0) { $sql .= "and rss_add_date like '%$rss_add_date%' "; }
-	if (strlen($rss_add_user) > 0) { $sql .= "and rss_add_user like '%$rss_add_user%' "; }
-	$sql .= "and rss_del_date is null ";
-
-	$sql = trim($sql);
-	if (substr($sql, -5) == "where"){ $sql = substr($sql, 0, (strlen($sql)-5)); }
-	if (substr($sql, -3) == " or"){ $sql = substr($sql, 0, (strlen($sql)-5)); }
-	$sql = str_replace ("where and", "where", $sql);
-	$sql = str_replace ("or and", "or", $sql);
-	//echo $sql;
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	$result_count = count($result);
-
-	$c = 0;
-	$row_style["0"] = "background-color: #F5F5DC;";
-	$row_style["1"] = "background-color: #FFFFFF;";
-
-	echo "<b>".$text['label-search']."</b><br>";
-	echo "<div align='left'>\n";
-	echo "<table border='0' cellpadding='1' cellspacing='1'>\n";
-	echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>";
-
-	if ($result_count == 0) { //no results
-		echo "<tr><td>&nbsp;</td></tr>";
-	}
-	else { //received results
-
-		echo "<tr>";
-		  echo "<th nowrap>&nbsp; &nbsp; ".$text['label-id']."&nbsp; &nbsp; </th>";
-		  echo "<th nowrap>&nbsp; &nbsp; ".$text['label-category']."&nbsp; &nbsp; </th>";
-		  echo "<th nowrap>&nbsp; &nbsp; ".$text['label-sub-category']."&nbsp; &nbsp; </th>";
-		  echo "<th nowrap>&nbsp; &nbsp; ".$text['label-title']."&nbsp; &nbsp; </th>";
-		  //echo "<th nowrap>&nbsp; &nbsp; rss_link&nbsp; &nbsp; </th>";
-		  //echo "<th nowrap>&nbsp; &nbsp; rss_description&nbsp; &nbsp; </th>";
-		  //echo "<th nowrap>&nbsp; &nbsp; rss_img&nbsp; &nbsp; </th>";
-		  //echo "<th nowrap>&nbsp; &nbsp; rss_optional_1&nbsp; &nbsp; </th>";
-		  //echo "<th nowrap>&nbsp; &nbsp; rss_optional_2&nbsp; &nbsp; </th>";
-		  //echo "<th nowrap>&nbsp; &nbsp; rss_optional_3&nbsp; &nbsp; </th>";
-		  //echo "<th nowrap>&nbsp; &nbsp; rss_optional_4&nbsp; &nbsp; </th>";
-		  //echo "<th nowrap>&nbsp; &nbsp; rss_optional_5&nbsp; &nbsp; </th>";
-		  //echo "<th nowrap>&nbsp; &nbsp; rss_add_date&nbsp; &nbsp; </th>";
-		  //echo "<th nowrap>&nbsp; &nbsp; rss_add_user&nbsp; &nbsp; </th>";
-		echo "</tr>";
-		echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-
-		foreach($result as $row) {
-		//print_r( $row );
-			echo "<tr style='".$row_style[$c]."'>\n";
-				echo "<td valign='top'><a href='rssupdate.php?rss_uuid=".$row[rss_uuid]."'>".$row[rss_uuid]."</a></td>";
-				echo "<td valign='top'>".$row[rss_category]."</td>";
-				echo "<td valign='top'>".$row[rss_sub_category]."</td>";
-				echo "<td valign='top'>".$row[rss_title]."</td>";
-				//echo "<td valign='top'>".$row[rss_link]."</td>";
-				//echo "<td valign='top'>".$row[rss_description]."</td>";
-				//echo "<td valign='top'>".$row[rss_img]."</td>";
-				//echo "<td valign='top'>".$row[rss_optional_1]."</td>";
-				//echo "<td valign='top'>".$row[rss_optional_2]."</td>";
-				//echo "<td valign='top'>".$row[rss_optional_3]."</td>";
-				//echo "<td valign='top'>".$row[rss_optional_4]."</td>";
-				//echo "<td valign='top'>".$row[rss_optional_5]."</td>";
-				//echo "<td valign='top'>".$row[rss_add_date]."</td>";
-				//echo "<td valign='top'>".$row[rss_add_user]."</td>";
-			echo "</tr>";
-
-			echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-			if ($c==0) { $c=1; } else { $c=0; }
-		} //end foreach        unset($sql, $result, $row_count);
-
-		echo "</table>\n";
-		echo "</div>\n";
-
-
-		echo "  <br><br>";
-		echo "  </td>\n";
-		echo "</tr>\n";
-
-	} //end if results
-
-	echo "</table>\n";
-	echo "</div>";
-
-	echo "<br><br>";
-	require_once "resources/footer.php";
-
-	unset ($result_count);
-	unset ($result);
-	unset ($key);
-	unset ($val);
-	unset ($c);
-
-	}
-	else {
-
-		echo "\n";    require_once "resources/header.php";
-	echo "<div align='center'>";
-	echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
-
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"left\">\n";
-	echo "      <br>";
-
-
-	echo "<form method='post' action=''>";
-	echo "<table>";
-	echo "	<tr>";
-	echo "		<td>Id</td>";
-	echo "		<td><input type='text' class='txt' name='rss_uuid'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>".$text['label-category']."</td>";
-	echo "		<td><input type='text' class='txt' name='rss_category'></td>";
-	echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_category</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_sub_category'></td>";
-	//echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>".$text['label-title']."</td>";
-	echo "		<td><input type='text' class='txt' name='rss_title'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>".$text['label-link']."</td>";
-	echo "		<td><input type='text' class='txt' name='rss_link'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>".$text['label-description']."</td>";
-	echo "		<td><input type='text' class='txt' name='rss_description'></td>";
-	echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>Image</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_img'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_optional_1</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_optional_1'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_optional_2</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_optional_2'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_optional_3</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_optional_3'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_optional_4</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_optional_4'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_optional_5</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_optional_5'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_add_date</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_add_date'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_add_user</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_add_user'></td>";
-	//echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td colspan='2' align='right'><input type='submit' name='submit' class='btn' value='".$text['button-search']."'></td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</form>";
-
-
-	echo "	</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</div>";
-
-
-require_once "resources/footer.php";
-
-} //end if not post
-?>
diff --git a/app/content/rsssubadd.php b/app/content/rsssubadd.php
deleted file mode 100644
index 437411407e..0000000000
--- a/app/content/rsssubadd.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_add')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-$rss_uuid = $_GET["rss_uuid"];
-
-if (count($_POST)>0) {
-	$rss_uuid = check_str($_POST["rss_uuid"]);
-	$rss_sub_title = check_str($_POST["rss_sub_title"]);
-	$rss_sub_link = check_str($_POST["rss_sub_link"]);
-	$rss_sub_description = check_str($_POST["rss_sub_description"]);
-	$rss_sub_optional_1 = check_str($_POST["rss_sub_optional_1"]);
-	$rss_sub_optional_2 = check_str($_POST["rss_sub_optional_2"]);
-	$rss_sub_optional_3 = check_str($_POST["rss_sub_optional_3"]);
-	$rss_sub_optional_4 = check_str($_POST["rss_sub_optional_4"]);
-	$rss_sub_optional_5 = check_str($_POST["rss_sub_optional_5"]);
-	$rss_sub_add_date = check_str($_POST["rss_sub_add_date"]);
-	$rss_sub_add_user = check_str($_POST["rss_sub_add_user"]);
-
-	$rss_sub_uuid = uuid();
-	$sql = "insert into v_rss_sub ";
-	$sql .= "(";
-	$sql .= "domain_uuid, ";
-	$sql .= "rss_uuid, ";
-	$sql .= "rss_sub_uuid, ";
-	$sql .= "rss_sub_title, ";
-	$sql .= "rss_sub_link, ";
-	$sql .= "rss_sub_description, ";
-	$sql .= "rss_sub_optional_1, ";
-	$sql .= "rss_sub_optional_2, ";
-	$sql .= "rss_sub_optional_3, ";
-	$sql .= "rss_sub_optional_4, ";
-	$sql .= "rss_sub_optional_5, ";
-	$sql .= "rss_sub_add_date, ";
-	$sql .= "rss_sub_add_user ";
-	$sql .= ")";
-	$sql .= "values ";
-	$sql .= "(";
-	$sql .= "'$domain_uuid', ";
-	$sql .= "'$rss_uuid', ";
-	$sql .= "'$rss_sub_uuid', ";
-	$sql .= "'$rss_sub_title', ";
-	$sql .= "'$rss_sub_link', ";
-	$sql .= "'$rss_sub_description', ";
-	$sql .= "'$rss_sub_optional_1', ";
-	$sql .= "'$rss_sub_optional_2', ";
-	$sql .= "'$rss_sub_optional_3', ";
-	$sql .= "'$rss_sub_optional_4', ";
-	$sql .= "'$rss_sub_optional_5', ";
-	$sql .= "now(), ";
-	$sql .= "'".$_SESSION["username"]."' ";
-	$sql .= ")";
-	$db->exec(check_sql($sql));
-	unset($sql);
-
-	$_SESSION["message"] = $text['message-add'];
-	header("Location: rsssublist.php?rss_uuid=".$rss_uuid);
-	return;
-}
-
-//show the header
-	require_once "resources/header.php";
-	require_once "resources/wysiwyg.php";
-
-//show the content
-	echo "<form method='post' action=''>";
-	echo "<table cellpadding='0' cellspacing='0' width='100%'>";
-	echo "	<tr>";
-	echo "		<td nowrap>".$text['label-title']."</td>";
-	echo "		<td width='100%'><input type='text' class='txt' name='rss_sub_title'></td>";
-	echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>Link</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_sub_link'></td>";
-	//echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td valign='top'>".$text['label-description']."</td>";
-	echo "        <td>";
-	echo "		    <textarea class='txt' rows='12' name='rss_sub_description'></textarea>";
-	echo "        </td>";
-	echo "	</tr>";
-	/*
-	echo "	<tr>";
-	echo "		<td>rss_sub_optional_1</td>";
-	echo "		<td><input type='text' name='rss_sub_optional_1'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>rss_sub_optional_2</td>";
-	echo "		<td><input type='text' name='rss_sub_optional_2'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>rss_sub_optional_3</td>";
-	echo "		<td><input type='text' name='rss_sub_optional_3'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>rss_sub_optional_4</td>";
-	echo "		<td><input type='text' name='rss_sub_optional_4'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>rss_sub_optional_5</td>";
-	echo "		<td><input type='text' name='rss_sub_optional_5'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>rss_sub_add_date</td>";
-	echo "		<td><input type='text' name='rss_sub_add_date'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>rss_sub_add_user</td>";
-	echo "		<td><input type='text' name='rss_sub_add_user'></td>";
-	echo "	</tr>";
-	*/
-	//echo "	<tr>";
-	//echo "	<td>example</td>";
-	//echo "	<td><textarea name='example'></textarea></td>";
-	//echo "	</tr>";    echo "	<tr>";
-	echo "		<td colspan='2' align='right'>";
-	echo "		    <input type='hidden' name='rss_uuid' value='$rss_uuid'>";
-	echo "			<br><br>";
-	echo "          <input type='submit' name='submit' class='btn' value='".$text['button-add-title']."'>";
-	echo "      </td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "<br><br>";
-	echo "</form>";
-
-//show the footer
-	require_once "resources/footer.php";
-?>
\ No newline at end of file
diff --git a/app/content/rsssubcategoryadd.php b/app/content/rsssubcategoryadd.php
deleted file mode 100644
index a2ec4dcdf1..0000000000
--- a/app/content/rsssubcategoryadd.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_add')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-if (count($_POST)>0) {
-	$rss_sub_category_uuid = uuid();
-	$rss_category = check_str($_POST["rss_category"]);
-	$rss_sub_category = check_str($_POST["rss_sub_category"]);
-	$rss_sub_category_description = check_str($_POST["rss_sub_category_description"]);
-	$rss_add_user = check_str($_POST["rss_add_user"]);
-	$rss_add_date = check_str($_POST["rss_add_date"]);
-
-	$sql = "insert into v_rss_sub_category ";
-	$sql .= "(";
-	$sql .= "domain_uuid, ";
-	$sql .= "rss_sub_category_uuid, ";
-	$sql .= "rss_category, ";
-	$sql .= "rss_sub_category, ";
-	$sql .= "rss_sub_category_description, ";
-	$sql .= "rss_add_user, ";
-	$sql .= "rss_add_date ";
-	$sql .= ")";
-	$sql .= "values ";
-	$sql .= "(";
-	$sql .= "'$domain_uuid', ";
-	$sql .= "'$rss_sub_category_uuid', ";
-	$sql .= "'$rss_category', ";
-	$sql .= "'$rss_sub_category', ";
-	$sql .= "'$rss_sub_category_description', ";
-	$sql .= "'$rss_add_user', ";
-	$sql .= "'$rss_add_date' ";
-	$sql .= ")";
-	$db->exec(check_sql($sql));
-	unset($sql);
-
-	$_SESSION["message"] = $text['message-add'];
-	header("Location: rss_sub_categorylist.php");
-	return;
-}
-
-require_once "resources/header.php";
-
-echo "<form method='post' action=''>";
-echo "<table>";
-echo "	<tr>";
-echo "		<td>".$text['label-rss-category']."</td>";
-echo "		<td><input type='text' name='rss_category'></td>";
-echo "	</tr>";
-echo "	<tr>";
-echo "		<td>rss_sub_category</td>";
-echo "		<td><input type='text' name='rss_sub_category'></td>";
-echo "	</tr>";
-echo "	<tr>";
-echo "		<td>rss_sub_category_description</td>";
-echo "		<td><input type='text' name='rss_sub_category_description'></td>";
-echo "	</tr>";
-echo "	<tr>";
-echo "		<td>rss_add_user</td>";
-echo "		<td><input type='text' name='rss_add_user'></td>";
-echo "	</tr>";
-echo "	<tr>";
-echo "		<td>rss_add_date</td>";
-echo "		<td><input type='text' name='rss_add_date'></td>";
-echo "	</tr>\n";
-echo "	<tr>";
-echo "		<td colspan='2' align='right'><input type='submit' name='submit' value='".$text['button-add-title']."'></td>";
-echo "	</tr>";
-echo "</table>";
-echo "</form>";
-
-require_once "resources/footer.php";
-?>
\ No newline at end of file
diff --git a/app/content/rsssubcategorylist.php b/app/content/rsssubcategorylist.php
deleted file mode 100644
index 8f80034826..0000000000
--- a/app/content/rsssubcategorylist.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-require_once "resources/header.php";
-
-$order_by = $_GET["order_by"];
-$order = $_GET["order"];    
-
-echo "<div align='center'>";
-echo "<table border='0' cellpadding='0' cellspacing='2'>\n";
-
-echo "<tr class='border'>\n";
-echo "	<td align=\"left\">\n";
-echo "      <br>";
-
-
-$sql = "";
-$sql .= "select * from v_rss_sub_category ";
-$sql .= "where domain_uuid = '$domain_uuid' ";
-if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-
-$prep_statement = $db->prepare(check_sql($sql));
-$prep_statement->execute();
-$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-$result_count = count($result);
-
-$c = 0;
-$row_style["0"] = "background-color: #F5F5DC;";
-$row_style["1"] = "background-color: #FFFFFF;";
-
-echo "<div align='left'>\n";
-echo "<table border='0' cellpadding='1' cellspacing='1'>\n";
-echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>";
-
-if ($result_count == 0) { //no results
-	echo "<tr><td>&nbsp;</td></tr>";
-}
-else { //received results
-
-	echo "<tr>";
-	  echo "<th nowrap>&nbsp; &nbsp; ";
-	  if (strlen($order_by)==0) {
-		echo "<a href='?order_by=rss_sub_category_uuid&order=desc' title='ascending'>rss_sub_category_uuid</a>";
-	  }
-	  else {
-		if ($order=="asc") {
-			echo "<a href='?order_by=rss_sub_category_uuid&order=desc' title='ascending'>rss_sub_category_uuid</a>";
-		}
-		else {
-			echo "<a href='?order_by=rss_sub_category_uuid&order=asc' title='descending'>rss_sub_category_uuid</a>";
-		}
-	  }
-	  echo "&nbsp; &nbsp; </th>";
-
-	  echo "<th nowrap>&nbsp; &nbsp; ";
-	  if (strlen($order_by)==0) {
-		echo "<a href='?order_by=rss_category&order=desc' title='ascending'>rss_category</a>";
-	  }
-	  else {
-		if ($order=="asc") {
-			echo "<a href='?order_by=rss_category&order=desc' title='ascending'>rss_category</a>";
-		}
-		else {
-			echo "<a href='?order_by=rss_category&order=asc' title='descending'>rss_category</a>";
-		}
-	  }
-	  echo "&nbsp; &nbsp; </th>";
-
-	  echo "<th nowrap>&nbsp; &nbsp; ";
-	  if (strlen($order_by)==0) {
-		echo "<a href='?order_by=rss_sub_category&order=desc' title='ascending'>rss_sub_category</a>";
-	  }
-	  else {
-		if ($order=="asc") {
-			echo "<a href='?order_by=rss_sub_category&order=desc' title='ascending'>rss_sub_category</a>";
-		}
-		else {
-			echo "<a href='?order_by=rss_sub_category&order=asc' title='descending'>rss_sub_category</a>";
-		}
-	  }
-	  echo "&nbsp; &nbsp; </th>";
-
-	  echo "<th nowrap>&nbsp; &nbsp; ";
-	  if (strlen($order_by)==0) {
-		echo "<a href='?order_by=rss_sub_category_description&order=desc' title='ascending'>rss_sub_category_description</a>";
-	  }
-	  else {
-		if ($order=="asc") {
-			echo "<a href='?order_by=rss_sub_category_description&order=desc' title='ascending'>rss_sub_category_description</a>";
-		}
-		else {
-			echo "<a href='?order_by=rss_sub_category_description&order=asc' title='descending'>rss_sub_category_description</a>";
-		}
-	  }
-	  echo "&nbsp; &nbsp; </th>";
-
-	  echo "<th nowrap>&nbsp; &nbsp; ";
-	  if (strlen($order_by)==0) {
-		echo "<a href='?order_by=rss_add_user&order=desc' title='ascending'>rss_add_user</a>";
-	  }
-	  else {
-		if ($order=="asc") {
-			echo "<a href='?order_by=rss_add_user&order=desc' title='ascending'>rss_add_user</a>";
-		}
-		else {
-			echo "<a href='?order_by=rss_add_user&order=asc' title='descending'>rss_add_user</a>";
-		}
-	  }
-	  echo "&nbsp; &nbsp; </th>";
-
-	  echo "<th nowrap>&nbsp; &nbsp; ";
-	  if (strlen($order_by)==0) {
-		echo "<a href='?order_by=rss_add_date&order=desc' title='ascending'>rss_add_date</a>";
-	  }
-	  else {
-		if ($order=="asc") {
-			echo "<a href='?order_by=rss_add_date&order=desc' title='ascending'>rss_add_date</a>";
-		}
-		else {
-			echo "<a href='?order_by=rss_add_date&order=asc' title='descending'>rss_add_date</a>";
-		}
-	  }
-	  echo "&nbsp; &nbsp; </th>";
-
-	echo "</tr>";
-	echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-
-	foreach($result as $row) {
-	//print_r( $row );
-		echo "<tr style='".$row_style[$c]."'>\n";
-			echo "<td valign='top'><a href='rss_sub_categoryupdate.php?rss_sub_category_uuid=".$row[rss_sub_category_uuid]."'>".$row[rss_sub_category_uuid]."</a></td>";
-			echo "<td valign='top'>".$row[rss_category]."</td>";
-			echo "<td valign='top'>".$row[rss_sub_category]."</td>";
-			echo "<td valign='top'>".$row[rss_sub_category_description]."</td>";
-			echo "<td valign='top'>".$row[rss_add_user]."</td>";
-			echo "<td valign='top'>".$row[rss_add_date]."</td>";
-		echo "</tr>";
-
-		echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-		if ($c==0) { $c=1; } else { $c=0; }
-	} //end foreach        unset($sql, $result, $row_count);
-
-	echo "</table>\n";
-	echo "</div>\n";
-
-
-	echo "  <br><br>";
-	echo "  </td>\n";
-	echo "</tr>\n";
-
-} //end if results
-
-echo "</table>\n";
-echo "<input type='button' class='btn' name='' onclick=\"window.location='rss_sub_categorysearch.php'\" value='".$text['button-search']."'>&nbsp; &nbsp;\n";
-echo "<input type='button' class='btn' name='' onclick=\"window.location='rss_sub_categoryadd.php'\" value='".$text['button-add-title']."'>&nbsp; &nbsp;\n";
-echo "</div>";
-
-echo "<br><br>";
-require_once "resources/footer.php";
-
-unset ($result_count);
-unset ($result);
-unset ($key);
-unset ($val);
-unset ($c);
-
-?>
diff --git a/app/content/rsssubcategoryupdate.php b/app/content/rsssubcategoryupdate.php
deleted file mode 100644
index af84204dfc..0000000000
--- a/app/content/rsssubcategoryupdate.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_edit')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-if (count($_POST)>0) {
-	$rss_sub_category_uuid = check_str($_POST["rss_sub_category_uuid"]);
-	$rss_category = check_str($_POST["rss_category"]);
-	$rss_sub_category = check_str($_POST["rss_sub_category"]);
-	$rss_sub_category_description = check_str($_POST["rss_sub_category_description"]);
-	$rss_add_user = check_str($_POST["rss_add_user"]);
-	$rss_add_date = check_str($_POST["rss_add_date"]);
-
-	//sql update
-	$sql  = "update v_rss_sub_category set ";
-	$sql .= "rss_category = '$rss_category', ";
-	$sql .= "rss_sub_category = '$rss_sub_category', ";
-	$sql .= "rss_sub_category_description = '$rss_sub_category_description', ";
-	$sql .= "rss_add_user = '$rss_add_user', ";
-	$sql .= "rss_add_date = '$rss_add_date' ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and rss_sub_category_uuid = '$rss_sub_category_uuid' ";
-	$count = $db->exec(check_sql($sql));
-	//echo "Affected Rows: ".$count;
-
-	$_SESSION["message"] = $text['message-update'];
-	header("Location: rss_sub_categorylist.php");
-	return;
-}
-else {
-	//get data from the db
-	$rss_sub_category_uuid = $_GET["rss_sub_category_uuid"];
-
-	$sql = "";
-	$sql .= "select * from v_rss_sub_category ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and rss_sub_category_uuid = '$rss_sub_category_uuid' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	foreach ($result as &$row) {
-		$rss_category = $row["rss_category"];
-		$rss_sub_category = $row["rss_sub_category"];
-		$rss_sub_category_description = $row["rss_sub_category_description"];
-		$rss_add_user = $row["rss_add_user"];
-		$rss_add_date = $row["rss_add_date"];
-		break; //limit to 1 row
-	}
-}
-
-require_once "resources/header.php";
-
-echo "<form method='post' action=''>";
-echo "<table>";
-echo "	<tr>";
-echo "		<td>rss_category</td>";
-echo "		<td><input type='text' name='rss_category' value='$rss_category'></td>";
-echo "	</tr>";
-echo "	<tr>";
-echo "		<td>rss_sub_category</td>";
-echo "		<td><input type='text' name='rss_sub_category' value='$rss_sub_category'></td>";
-echo "	</tr>";
-echo "	<tr>";
-echo "		<td>rss_sub_category_description</td>";
-echo "		<td><input type='text' name='rss_sub_category_description' value='$rss_sub_category_description'></td>";
-echo "	</tr>";
-echo "	<tr>";
-echo "		<td>rss_add_user</td>";
-echo "		<td><input type='text' name='rss_add_user' value='$rss_add_user'></td>";
-echo "	</tr>";
-echo "	<tr>";
-echo "		<td>rss_add_date</td>";
-echo "		<td><input type='text' name='rss_add_date' value='$rss_add_date'></td>";
-echo "	</tr>";
-echo "	<tr>";
-echo "		<td colspan='2' align='right'>";
-echo "     <input type='hidden' name='rss_sub_category_uuid' value='$rss_sub_category_uuid'>";
-echo "		<br><br>";
-echo "     <input type='submit' name='submit' value='".$text['button-update']."'>";
-echo "		</td>";
-echo "	</tr>";
-echo "</table>";
-echo "<br><br>";
-echo "</form>";
-
-  require_once "resources/footer.php";
-?>
diff --git a/app/content/rsssubdelete.php b/app/content/rsssubdelete.php
deleted file mode 100644
index f9eafc7176..0000000000
--- a/app/content/rsssubdelete.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_delete')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-if (count($_GET)>0) {
-	$rss_uuid = check_str($_GET["rss_uuid"]);
-	$rss_sub_uuid = check_str($_GET["rss_sub_uuid"]);
-
-	//mark the the item as deleted and who deleted it
-	$sql  = "update v_rss_sub set ";
-	$sql .= "rss_sub_del_date = now(), ";
-	$sql .= "rss_sub_del_user = '".$_SESSION["username"]."' ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and rss_sub_uuid = '$rss_sub_uuid' ";
-	$db->exec(check_sql($sql));
-	unset($sql);
-
-	$_SESSION["message"] = $text['message-delete-done'];
-	header("Location: rsssublist.php?rss_uuid=".$rss_uuid);
-	return;
-}
-
-?>
\ No newline at end of file
diff --git a/app/content/rsssublist.php b/app/content/rsssublist.php
deleted file mode 100644
index 07ea27282a..0000000000
--- a/app/content/rsssublist.php
+++ /dev/null
@@ -1,449 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-$rss_uuid = $_GET["rss_uuid"];
-$order_by = $_GET["order_by"];
-$order = $_GET["order"];
-
-require_once "resources/header.php";
-
-
-	echo "<div align='center'>";
-	echo "<table width='500' border='0' cellpadding='0' cellspacing='2'>\n";
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"left\">\n";
-
-	echo "      <br>";
-	echo "      <b>$module_title ".$text['label-details']."</b>";
-	$sql = "";
-	$sql .= "select * from v_rss ";
-	$sql .= "where domain_uuid = '$domain_uuid'  ";
-	$sql .= "and rss_uuid = '$rss_uuid'  ";
-	$sql .= "and rss_category = '$rss_category' ";
-	$sql .= "and length(rss_del_date) = 0 ";	
-	$sql .= "or domain_uuid = '$domain_uuid'  ";
-	$sql .= "and rss_uuid = '$rss_uuid'  ";
-	$sql .= "and rss_category = '$rss_category' ";
-	$sql .= "and rss_del_date is null  ";
-	$sql .= "order by rss_uuid asc ";
-
-	//echo $sql;
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	$result_count = count($result);
-	echo "<table border='0' width='100%'>";
-	if ($result_count == 0) { //no results
-		echo "<tr><td>&nbsp;</td></tr>";
-	}
-	else { //received results
-		foreach($result as $row) {
-		  //print_r( $row );
-			  //echo "<tr style='".$row_style[$c]."'>\n";
-			  //echo "<tr>";
-			  //echo "    <td valign='top'>Title</td>";
-			  //echo "    <td valign='top'><a href='rssupdate.php?rss_uuid=".$row[rss_uuid]."'>".$row[rss_uuid]."</a></td>";
-			  //echo "</tr>";
-			  //echo "<td valign='top'>".$row[rss_category]."</td>";
-			  
-			  echo "<tr>";
-			  echo "    <td valign='top'>".$text['label-title'].": &nbsp;</td>";
-			  echo "    <td valign='top'><b>".$row[rss_title]."</b></td>";
-			  echo "    <td valign='top' align='right'>";
-			  echo "        <input type='button' class='btn' name='' onclick=\"window.location='rssupdate.php?rss_uuid=".$row[rss_uuid]."'\" value='".$text['button-update']."'>";
-			  echo "    </td>";
-			  $rss_description = $row[rss_description];
-			  //$rss_description = str_replace ("\r\n", "<br>", $rss_description);
-			  //$rss_description = str_replace ("\n", "<br>", $rss_description);
-			  echo "</tr>";              
-			  
-			  
-			  echo "<tr>";
-			  echo "    <td valign='top'>".$text['label-template'].": &nbsp;</td>";
-			  echo "     <td valign='top'>".$row[rss_sub_category]."</td>";
-			  echo "</tr>";
-
-			  echo "<tr>";
-			  echo "    <td valign='top'>".$text['label-group'].": &nbsp;</td>";
-			  echo "     <td valign='top'>".$row[rss_group]."</td>";
-			  echo "</tr>";
-			  
-			  if (strlen($row[rss_order]) > 0) {
-				  echo "<tr>";
-				  echo "    <td valign='top'>".$text['label-order'].": &nbsp;</td>";
-				  echo "     <td valign='top'>".$row[rss_order]."</td>";
-				  echo "</tr>";
-			  }
-
-			  //echo "<td valign='top'>".$row[rss_link]."</td>";
-			  echo "    <td valign='top'>".$text['label-description'].": &nbsp;</td>";
-			  echo "    <td valign='top' colspan='2'>".$rss_description."</td>";
-			  //echo "<td valign='top'>".$row[rss_img]."</td>";
-
-			  //echo "<tr>";
-			  //echo "    <td valign='top'>Priority: &nbsp;</td>";
-			  //echo "    <td valign='top' colspan='2'>".$row[rss_optional_1]."</td>"; //priority
-			  //echo "</tr>";
-
-			  //echo "<tr>";
-			  //echo "    <td valign='top'>Status: &nbsp;</td>"; //completion status
-			  //echo "    <td valign='top' colspan='2'>";
-			  //echo      $row[rss_optional_2];
-			  //if ($row[rss_optional_2]=="100") {
-			  //    echo "Complete";
-			  //}
-			  //else {
-			  //    echo $row[rss_optional_2]."%";
-			  //}
-			  //echo      "</td>"; //completion status
-			  //echo "<td valign='top'>".$row[rss_optional_3]."</td>";
-			  //echo "<td valign='top'>".$row[rss_optional_4]."</td>";
-			  //echo "<td valign='top'>".$row[rss_optional_5]."</td>";
-			  //echo "<td valign='top'>".$row[rss_add_date]."</td>";
-			  //echo "<td valign='top'>".$row[rss_add_user]."</td>";
-			  //echo "<tr>";
-			  //echo "    <td valign='top'>";
-			  //echo "      <a href='rsssublist.php?rss_uuid=".$row[rss_uuid]."'>Details</a>";
-			  //echo "        <input type='button' class='btn' name='' onclick=\"window.location='rsssublist.php?rss_uuid=".$row[rss_uuid]."'\" value='Details'>";
-			  //echo "    </td>";
-			  //echo "</tr>";
-
-			  echo "</tr>";
-
-			  //echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-			  if ($c==0) { $c=1; } else { $c=0; }
-		} //end foreach
-	}
-	echo "</table>";
-	unset($sql, $prep_statement, $result);
-
-
-	if ($rss_sub_show == 1) {
-
-		echo "<br><br><br>";
-		echo "<b>$rss_sub_title</b><br>";
-
-		$sql = "";
-		$sql .= "select * from v_rss_sub ";
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and rss_uuid = '$rss_uuid' ";
-		$sql .= "and length(rss_sub_del_date) = 0 ";
-		$sql .= "or domain_uuid = '$domain_uuid' ";
-		$sql .= "and rss_uuid = '$rss_uuid' ";
-		$sql .= "and rss_sub_del_date is null ";
-		if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-		//echo $sql;
-
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-		$result_count = count($result);
-
-		$c = 0;
-		$row_style["0"] = "background-color: #F5F5DC;";
-		$row_style["1"] = "background-color: #FFFFFF;";
-
-		echo "<div align='left'>\n";
-		echo "<table width='100%' border='0' cellpadding='1' cellspacing='1'>\n";
-		//echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>";
-
-		if ($result_count == 0) { //no results
-			echo "<tr><td>&nbsp;</td></tr>";
-		}
-		else { //received results
-
-			echo "<tr>";
-			/*
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_uuid&order=desc' title='ascending'>rss_sub_uuid</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_uuid&order=desc' title='ascending'>rss_sub_uuid</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_uuid&order=asc' title='descending'>rss_sub_uuid</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_uuid&order=desc' title='ascending'>rss_uuid</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_uuid&order=desc' title='ascending'>rss_uuid</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_uuid&order=asc' title='descending'>rss_uuid</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_title&order=desc' title='ascending'>rss_sub_title</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_title&order=desc' title='ascending'>rss_sub_title</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_title&order=asc' title='descending'>rss_sub_title</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_link&order=desc' title='ascending'>rss_sub_link</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_link&order=desc' title='ascending'>rss_sub_link</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_link&order=asc' title='descending'>rss_sub_link</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_description&order=desc' title='ascending'>rss_sub_description</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_description&order=desc' title='ascending'>rss_sub_description</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_description&order=asc' title='descending'>rss_sub_description</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_optional_1&order=desc' title='ascending'>rss_sub_optional_1</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_optional_1&order=desc' title='ascending'>rss_sub_optional_1</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_optional_1&order=asc' title='descending'>rss_sub_optional_1</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_optional_2&order=desc' title='ascending'>rss_sub_optional_2</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_optional_2&order=desc' title='ascending'>rss_sub_optional_2</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_optional_2&order=asc' title='descending'>rss_sub_optional_2</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_optional_3&order=desc' title='ascending'>rss_sub_optional_3</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_optional_3&order=desc' title='ascending'>rss_sub_optional_3</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_optional_3&order=asc' title='descending'>rss_sub_optional_3</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_optional_4&order=desc' title='ascending'>rss_sub_optional_4</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_optional_4&order=desc' title='ascending'>rss_sub_optional_4</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_optional_4&order=asc' title='descending'>rss_sub_optional_4</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_optional_5&order=desc' title='ascending'>rss_sub_optional_5</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_optional_5&order=desc' title='ascending'>rss_sub_optional_5</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_optional_5&order=asc' title='descending'>rss_sub_optional_5</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_add_date&order=desc' title='ascending'>rss_sub_add_date</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_add_date&order=desc' title='ascending'>rss_sub_add_date</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_add_date&order=asc' title='descending'>rss_sub_add_date</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-
-			  echo "<th nowrap>&nbsp; &nbsp; ";
-			  if (strlen($order_by)==0) {
-				echo "<a href='?order_by=rss_sub_add_user&order=desc' title='ascending'>rss_sub_add_user</a>";
-			  }
-			  else {
-				if ($order=="asc") {
-					echo "<a href='?order_by=rss_sub_add_user&order=desc' title='ascending'>rss_sub_add_user</a>";
-				}
-				else {
-					echo "<a href='?order_by=rss_sub_add_user&order=asc' title='descending'>rss_sub_add_user</a>";
-				}
-			  }
-			  echo "&nbsp; &nbsp; </th>";
-			  */
-
-			echo "</tr>";
-			echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-
-			foreach($result as $row) {
-			//print_r( $row );
-				echo "<tr style='".$row_style[$c]."'>\n";
-					//echo "<td valign='top'>".$rss_uuid."</td>";
-					//echo "<td valign='top'>&nbsp;<b>".$row[rss_sub_title]."</b>&nbsp;</td>";
-					//echo "<td valign='top'>&nbsp;".$row[rss_sub_link]."&nbsp;</td>";
-					echo "<td valign='top' width='200'>";
-					echo "  <b>".$row[rss_sub_title]."</b>";
-					echo "</td>";
-
-					echo "<td valign='top'>".$row[rss_sub_add_date]."</td>";
-
-					//echo "<td valign='top'>".$row[rss_sub_optional_1]."</td>";
-					//echo "<td valign='top'>".$row[rss_sub_optional_2]."</td>";
-					//echo "<td valign='top'>".$row[rss_sub_optional_3]."</td>";
-					//echo "<td valign='top'>".$row[rss_sub_optional_4]."</td>";
-					//echo "<td valign='top'>".$row[rss_sub_optional_5]."</td>";
-					//echo "<td valign='top'>".$row[rss_sub_add_user]."</td>";
-
-					echo "<td valign='top'>";
-					echo "  <input type='button' class='btn' name='' onclick=\"if (confirm('".$text['message-confirm-delete']."')) { window.location='rsssubdelete.php?rss_uuid=".$row[rss_uuid]."&rss_sub_uuid=".$row[rss_sub_uuid]."' }\" value='".$text['button-delete']."'>";
-					echo "</td>";
-
-					echo "<td valign='top' align='right'>";
-					echo "  &nbsp;";
-					echo "  <input type='button' class='btn' name='' onclick=\"window.location='rsssubupdate.php?rss_uuid=".$rss_uuid."&rss_sub_uuid=".$row[rss_sub_uuid]."'\" value='".$text['button-update']."'>";
-					echo "  &nbsp; \n";
-					//echo "  <a href='rsssubupdate.php?rss_uuid=".$rss_uuid."&rss_sub_uuid=".$row[rss_sub_uuid]."'>Update</a>&nbsp;";
-					echo "</td>";
-
-
-					$rss_sub_description = $row[rss_sub_description];
-					$rss_sub_description = str_replace ("\r\n", "<br>", $rss_sub_description);
-					$rss_sub_description = str_replace ("\n", "<br>", $rss_sub_description);
-
-					echo "</tr>";
-					echo "<tr style='".$row_style[$c]."'>\n";
-					echo "<td valign='top' width='300' colspan='4'>";
-					echo "".$rss_sub_description."&nbsp;";
-					echo "</td>";
-
-					echo "</tr>";
-
-
-
-				echo "</tr>";
-
-				echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-				if ($c==0) { $c=1; } else { $c=0; }
-			} //end foreach        unset($sql, $result, $row_count);
-
-
-
-		} //end if results
-
-		echo "</table>\n";
-		echo "</div>\n";
-
-
-	} //if ($showrsssub == 1) {
-
-	echo "  <br><br>";
-	echo "  </td>\n";
-	echo "</tr>\n";
-	echo "</table>\n";
-
-	//echo "<input type='button' class='btn' name='' onclick=\"window.location='rsssubsearch.php'\" value='Search'>&nbsp; &nbsp;\n";
-	if ($rss_sub_show == 1) {
-		echo "<input type='button' class='btn' name='' onclick=\"window.location='rsssubadd.php?rss_uuid=".$rss_uuid."'\" value='".$text['button-add-title']." $rss_sub_title'>&nbsp; &nbsp;\n";
-	}
-	echo "</div>";
-
-	echo "<br><br>";
-	require_once "resources/footer.php";
-
-	unset ($result_count);
-	unset ($result);
-	unset ($key);
-	unset ($val);
-	unset ($c);
-
-?>
diff --git a/app/content/rsssubsearch.php b/app/content/rsssubsearch.php
deleted file mode 100644
index 4609eebff1..0000000000
--- a/app/content/rsssubsearch.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-if (count($_POST)>0) {
-	$rss_sub_uuid = check_str($_POST["rss_sub_uuid"]);
-	$rss_uuid = check_str($_POST["rss_uuid"]);
-	$rss_sub_title = check_str($_POST["rss_sub_title"]);
-	$rss_sub_link = check_str($_POST["rss_sub_link"]);
-	$rss_sub_description = check_str($_POST["rss_sub_description"]);
-	$rss_sub_optional_1 = check_str($_POST["rss_sub_optional_1"]);
-	$rss_sub_optional_2 = check_str($_POST["rss_sub_optional_2"]);
-	$rss_sub_optional_3 = check_str($_POST["rss_sub_optional_3"]);
-	$rss_sub_optional_4 = check_str($_POST["rss_sub_optional_4"]);
-	$rss_sub_optional_5 = check_str($_POST["rss_sub_optional_5"]);
-	$rss_sub_add_date = check_str($_POST["rss_sub_add_date"]);
-	$rss_sub_add_user = check_str($_POST["rss_sub_add_user"]);
-
-
-	require_once "resources/header.php";
-
-	$sql = "";
-	$sql .= "select * from v_rss_sub ";
-	$sql .= "where ";
-	if (strlen($domain_uuid) > 0) { $sql .= "and rss_sub_uuid = '$domain_uuid' "; }
-	if (strlen($rss_sub_uuid) > 0) { $sql .= "and rss_sub_uuid like '%$rss_sub_uuid%' "; }
-	if (strlen($rss_uuid) > 0) { $sql .= "and rss_uuid like '%$rss_uuid%' "; }
-	if (strlen($rss_sub_title) > 0) { $sql .= "and rss_sub_title like '%$rss_sub_title%' "; }
-	if (strlen($rss_sub_link) > 0) { $sql .= "and rss_sub_link like '%$rss_sub_link%' "; }
-	if (strlen($rss_sub_description) > 0) { $sql .= "and rss_sub_description like '%$rss_sub_description%' "; }
-	if (strlen($rss_sub_optional_1) > 0) { $sql .= "and rss_sub_optional_1 like '%$rss_sub_optional_1%' "; }
-	if (strlen($rss_sub_optional_2) > 0) { $sql .= "and rss_sub_optional_2 like '%$rss_sub_optional_2%' "; }
-	if (strlen($rss_sub_optional_3) > 0) { $sql .= "and rss_sub_optional_3 like '%$rss_sub_optional_3%' "; }
-	if (strlen($rss_sub_optional_4) > 0) { $sql .= "and rss_sub_optional_4 like '%$rss_sub_optional_4%' "; }
-	if (strlen($rss_sub_optional_5) > 0) { $sql .= "and rss_sub_optional_5 like '%$rss_sub_optional_5%' "; }
-	if (strlen($rss_sub_add_date) > 0) { $sql .= "and rss_sub_add_date like '%$rss_sub_add_date%' "; }
-	if (strlen($rss_sub_add_user) > 0) { $sql .= "and rss_sub_add_user like '%$rss_sub_add_user%' "; }
-	$sql .= "and length(rss_sub_del_date) = 0 ";
-	$sql .= "or ";
-	if (strlen($domain_uuid) > 0) { $sql .= "and rss_sub_uuid = '$domain_uuid' "; }
-	if (strlen($rss_sub_uuid) > 0) { $sql .= "and rss_sub_uuid like '%$rss_sub_uuid%' "; }
-	if (strlen($rss_uuid) > 0) { $sql .= "and rss_uuid like '%$rss_uuid%' "; }
-	if (strlen($rss_sub_title) > 0) { $sql .= "and rss_sub_title like '%$rss_sub_title%' "; }
-	if (strlen($rss_sub_link) > 0) { $sql .= "and rss_sub_link like '%$rss_sub_link%' "; }
-	if (strlen($rss_sub_description) > 0) { $sql .= "and rss_sub_description like '%$rss_sub_description%' "; }
-	if (strlen($rss_sub_optional_1) > 0) { $sql .= "and rss_sub_optional_1 like '%$rss_sub_optional_1%' "; }
-	if (strlen($rss_sub_optional_2) > 0) { $sql .= "and rss_sub_optional_2 like '%$rss_sub_optional_2%' "; }
-	if (strlen($rss_sub_optional_3) > 0) { $sql .= "and rss_sub_optional_3 like '%$rss_sub_optional_3%' "; }
-	if (strlen($rss_sub_optional_4) > 0) { $sql .= "and rss_sub_optional_4 like '%$rss_sub_optional_4%' "; }
-	if (strlen($rss_sub_optional_5) > 0) { $sql .= "and rss_sub_optional_5 like '%$rss_sub_optional_5%' "; }
-	if (strlen($rss_sub_add_date) > 0) { $sql .= "and rss_sub_add_date like '%$rss_sub_add_date%' "; }
-	if (strlen($rss_sub_add_user) > 0) { $sql .= "and rss_sub_add_user like '%$rss_sub_add_user%' "; }
-	$sql .= "and rss_sub_del_date is null ";
-
-	$sql = trim($sql);
-	if (substr($sql, -5) == "where"){ $sql = substr($sql, 0, (strlen($sql)-5)); }
-	if (substr($sql, -3) == " or"){ $sql = substr($sql, 0, (strlen($sql)-5)); }
-	$sql = str_replace ("where and", "where", $sql);
-	$sql = str_replace ("or and", "or", $sql);
-
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	$result_count = count($result);
-
-	$c = 0;
-	$row_style["0"] = "background-color: #F5F5DC;";
-	$row_style["1"] = "background-color: #FFFFFF;";
-
-	echo "<b>".$text['label-search']."</b><br>";
-
-	echo "<table border='0' cellpadding='1' cellspacing='1'>\n";
-	echo "	<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>";
-
-	if ($result_count == 0) { //no results
-		echo "<tr><td>&nbsp;</td></tr>";
-	}
-	else { //received results
-
-		echo "<tr>";
-			echo "<th nowrap>&nbsp; &nbsp; ".$text['label-sub-id']."&nbsp; &nbsp; </th>";
-			echo "<th nowrap>&nbsp; &nbsp; ".$text['label-id']."&nbsp; &nbsp; </th>";
-			echo "<th nowrap>&nbsp; &nbsp; ".$text['label-title']."&nbsp; &nbsp; </th>";
-			//echo "<th nowrap>&nbsp; &nbsp; Link&nbsp; &nbsp; </th>";
-			//echo "<th nowrap>&nbsp; &nbsp; rss_sub_description&nbsp; &nbsp; </th>";
-			//echo "<th nowrap>&nbsp; &nbsp; rss_sub_optional_1&nbsp; &nbsp; </th>";
-			//echo "<th nowrap>&nbsp; &nbsp; rss_sub_optional_2&nbsp; &nbsp; </th>";
-			//echo "<th nowrap>&nbsp; &nbsp; rss_sub_optional_3&nbsp; &nbsp; </th>";
-			//echo "<th nowrap>&nbsp; &nbsp; rss_sub_optional_4&nbsp; &nbsp; </th>";
-			//echo "<th nowrap>&nbsp; &nbsp; rss_sub_optional_5&nbsp; &nbsp; </th>";
-			//echo "<th nowrap>&nbsp; &nbsp; rss_sub_add_date&nbsp; &nbsp; </th>";
-			//echo "<th nowrap>&nbsp; &nbsp; rss_sub_add_user&nbsp; &nbsp; </th>";
-		echo "</tr>";
-		echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-
-		foreach($result as $row) {
-		//print_r( $row );
-			echo "<tr style='".$row_style[$c]."'>\n";
-				echo "<td valign='top'><a href='rsssubupdate.php?rss_sub_uuid=".$row[rss_sub_uuid]."'>".$row[rss_sub_uuid]."</a></td>";
-				echo "<td valign='top'>".$row[rss_uuid]."</td>";
-				echo "<td valign='top'>".$row[rss_sub_title]."</td>";
-				//echo "<td valign='top'>".$row[rss_sub_link]."</td>";
-				//echo "<td valign='top'>".$row[rss_sub_description]."</td>";
-				//echo "<td valign='top'>".$row[rss_sub_optional_1]."</td>";
-				//echo "<td valign='top'>".$row[rss_sub_optional_2]."</td>";
-				//echo "<td valign='top'>".$row[rss_sub_optional_3]."</td>";
-				//echo "<td valign='top'>".$row[rss_sub_optional_4]."</td>";
-				//echo "<td valign='top'>".$row[rss_sub_optional_5]."</td>";
-				//echo "<td valign='top'>".$row[rss_sub_add_date]."</td>";
-				//echo "<td valign='top'>".$row[rss_sub_add_user]."</td>";
-			echo "</tr>";
-			echo "<tr><td colspan='100%'><img src='/images/spacer.gif' width='100%' height='1' style='background-color: #BBBBBB;'></td></tr>\n";
-			if ($c==0) { $c=1; } else { $c=0; }
-		} //end foreach
-		unset($sql, $result, $row_count);
-
-	} //end if results
-
-	echo "</table>\n";
-	echo "<br><br>";
-
-	require_once "resources/footer.php";
-
-	unset ($result_count);
-	unset ($result);
-	unset ($key);
-	unset ($val);
-	unset ($c);
-
-}
-else {
-
-	require_once "resources/header.php";
-
-	echo "<form method='post' action=''>";
-	echo "<table>";
-	echo "	<tr>";
-	echo "		<td>".$text['label-sub-id']."</td>";
-	echo "		<td><input type='text' class='txt' name='rss_sub_uuid'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>".$text['label-id']."</td>";
-	echo "		<td><input type='text' class='txt' name='rss_uuid'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>".$text['label-sub-title']."</td>";
-	echo "		<td><input type='text' class='txt' name='rss_sub_title'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>".$text['label-sub-link']."</td>";
-	echo "		<td><input type='text' class='txt' name='rss_sub_link'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>".$text['label-sub-desc']."</td>";
-	echo "		<td><input type='text' class='txt' name='rss_sub_description'></td>";
-	echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_optional_1</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_sub_optional_1'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_optional_2</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_sub_optional_2'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_optional_3</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_sub_optional_3'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_optional_4</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_sub_optional_4'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_optional_5</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_sub_optional_5'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_add_date</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_sub_add_date'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_add_user</td>";
-	//echo "		<td><input type='text' class='txt' name='rss_sub_add_user'></td>";
-	//echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td colspan='2' align='right'><input type='submit' name='submit' class='btn' value='".$text['button-search']."'></td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "</form>";
-
-	require_once "resources/footer.php";
-
-} //end if not post
-?>
diff --git a/app/content/rsssubupdate.php b/app/content/rsssubupdate.php
deleted file mode 100644
index 1110f90233..0000000000
--- a/app/content/rsssubupdate.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_edit')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-$rss_uuid = $_GET["rss_uuid"];
-
-if (count($_POST)>0 && $_POST["persistform"] == "0") {
-	$rss_sub_uuid = check_str($_POST["rss_sub_uuid"]);
-	$rss_uuid = check_str($_POST["rss_uuid"]);
-	$rss_sub_title = check_str($_POST["rss_sub_title"]);
-	$rss_sub_link = check_str($_POST["rss_sub_link"]);
-	$rss_sub_description = check_str($_POST["rss_sub_description"]);
-	$rss_sub_optional_1 = check_str($_POST["rss_sub_optional_1"]);
-	$rss_sub_optional_2 = check_str($_POST["rss_sub_optional_2"]);
-	$rss_sub_optional_3 = check_str($_POST["rss_sub_optional_3"]);
-	$rss_sub_optional_4 = check_str($_POST["rss_sub_optional_4"]);
-	$rss_sub_optional_5 = check_str($_POST["rss_sub_optional_5"]);
-	$rss_sub_add_date = check_str($_POST["rss_sub_add_date"]);
-	$rss_sub_add_user = check_str($_POST["rss_sub_add_user"]);
-
-	$msg = '';
-	if (strlen($rss_uuid) == 0) { $msg .= $text['message-error-missing']." rss_uuid.<br>\n"; }
-	if (strlen($rss_sub_uuid) == 0) { $msg .= $text['message-error-missing']." rss_sub_uuid.<br>\n"; }
-	//if (strlen($rss_sub_title) == 0) { $msg .= "Please provide a title.<br>\n"; }
-	if (strlen($rss_sub_description) == 0) { $msg .= $text['message-description']."<br>\n"; }
-
-	if (strlen($msg) > 0) {
-		require_once "resources/persist_form.php";
-		require_once "resources/header.php";
-		echo "<div align='center'>";
-		echo "<table>";
-		echo "<tr>";
-		echo "<td>";
-		echo "  <div class='borderlight' align='left' style='padding:10px;'>";
-		echo "      $msg";
-		echo "      <br>";
-		echo "      <div align='center'>".persistform($_POST)."</div>";
-		echo "  </div>";
-		echo "</td>";
-		echo "</tr>";
-		echo "</table>";
-		echo "</div>";
-
-		require_once "resources/footer.php";
-		return;
-	}
-
-	//sql update
-	$sql  = "update v_rss_sub set ";
-	//$sql .= "rss_uuid = '$rss_uuid', ";
-	$sql .= "rss_sub_title = '$rss_sub_title', ";
-	$sql .= "rss_sub_link = '$rss_sub_link', ";
-	$sql .= "rss_sub_description = '$rss_sub_description', ";
-	$sql .= "rss_sub_optional_1 = '$rss_sub_optional_1', ";
-	$sql .= "rss_sub_optional_2 = '$rss_sub_optional_2', ";
-	$sql .= "rss_sub_optional_3 = '$rss_sub_optional_3', ";
-	$sql .= "rss_sub_optional_4 = '$rss_sub_optional_4', ";
-	$sql .= "rss_sub_optional_5 = '$rss_sub_optional_5' ";
-	//$sql .= "rss_sub_add_date = now(), ";
-	//$sql .= "rss_sub_add_user = '".$_SESSION["username"]."' ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and rss_sub_uuid = '$rss_sub_uuid' ";
-	//$sql .= "and rss_uuid = '$rss_uuid' ";
-	$count = $db->exec(check_sql($sql));
-	//echo "Affected Rows: ".$count;
-
-	$_SESSION["message"] = $text['message-update'];
-	header("Location: rsssublist.php?rss_uuid=".$rss_uuid."&rss_sub_uuid=".$rss_sub_uuid);
-	return;
-}
-else {
-	//get data from the db
-	$rss_sub_uuid = $_GET["rss_sub_uuid"];
-
-	$sql = "";
-	$sql .= "select * from v_rss_sub ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and rss_sub_uuid = '$rss_sub_uuid' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	foreach ($result as &$row) {
-		//$rss_uuid = $row["rss_uuid"];
-		$rss_sub_title = $row["rss_sub_title"];
-		$rss_sub_link = $row["rss_sub_link"];
-		$rss_sub_description = $row["rss_sub_description"];
-		$rss_sub_optional_1 = $row["rss_sub_optional_1"];
-		$rss_sub_optional_2 = $row["rss_sub_optional_2"];
-		$rss_sub_optional_3 = $row["rss_sub_optional_3"];
-		$rss_sub_optional_4 = $row["rss_sub_optional_4"];
-		$rss_sub_optional_5 = $row["rss_sub_optional_5"];
-		$rss_sub_add_date = $row["rss_sub_add_date"];
-		$rss_sub_add_user = $row["rss_sub_add_user"];
-		break; //limit to 1 row
-	}
-}
-
-//show the header
-	require_once "resources/header.php";
-	require_once "resources/wysiwyg.php";
-
-//show the content
-	echo "<form method='post' action=''>";
-	echo "<table cellpadding='0' cellspacing='0' width='100%'>";
-	//echo "	<tr>";
-	//echo "		<td>rss_uuid</td>";
-	//echo "		<td><input type='text' name='rss_uuid' class='txt' value='$rss_uuid'></td>";
-	//echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td nowrap>".$text['label-sub-title']."</td>";
-	echo "		<td width='100%'><input type='text' name='rss_sub_title' class='txt' value='$rss_sub_title'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td>".$text['label-sub-link']."</td>";
-	echo "		<td><input type='text' name='rss_sub_link' class='txt' value='$rss_sub_link'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td valign='top'>".$text['label-description']."</td>";
-	echo "		<td>";
-	echo "            <textarea name='rss_sub_description' rows='12' class='txt'>$rss_sub_description</textarea>";
-	echo "        </td>";
-	echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_optional_1</td>";
-	//echo "		<td><input type='text' name='rss_sub_optional_1' value='$rss_sub_optional_1'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_optional_2</td>";
-	//echo "		<td><input type='text' name='rss_sub_optional_2' value='$rss_sub_optional_2'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_optional_3</td>";
-	//echo "		<td><input type='text' name='rss_sub_optional_3' value='$rss_sub_optional_3'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_optional_4</td>";
-	//echo "		<td><input type='text' name='rss_sub_optional_4' value='$rss_sub_optional_4'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td>rss_sub_optional_5</td>";
-	//echo "		<td><input type='text' name='rss_sub_optional_5' value='$rss_sub_optional_5'></td>";
-	//echo "	</tr>";
-
-	echo "	<tr>";
-	echo "		<td colspan='2' align='right'>";
-	echo "		    <input type='hidden' name='rss_uuid' value='$rss_uuid'>";
-	echo "		    <input type='hidden' name='persistform' value='0'>";
-	echo "          <input type='hidden' name='rss_sub_uuid' value='$rss_sub_uuid'>";
-	echo "			<br><br>";
-	echo "          <input type='submit' name='submit' class='btn' value='".$text['button-update']."'>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "<br><br>";
-	echo "</form>";
-
-//show the footer
-  require_once "resources/footer.php";
-?>
diff --git a/app/content/rssupdate.php b/app/content/rssupdate.php
deleted file mode 100644
index bf28e75a44..0000000000
--- a/app/content/rssupdate.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-	James Rose <james.o.rose@gmail.com>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-require_once "config.php";
-if (permission_exists('content_edit')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//add multi-lingual support
-	$language = new text;
-	$text = $language->get();
-
-if (count($_POST)>0) {
-	$rss_uuid = check_str($_POST["rss_uuid"]);
-	//$rss_category = check_str($_POST["rss_category"]); //defined in local config.php
-	$rss_sub_category = check_str($_POST["rss_sub_category"]);
-	$rss_title = check_str($_POST["rss_title"]);
-	$rss_link = check_str($_POST["rss_link"]);
-	$rss_description = check_str($_POST["rss_description"]);
-	$rss_group = check_str($_POST["rss_group"]);
-	$rss_order = check_str($_POST["rss_order"]);
-
-	//$rss_description = str_replace ("<br />\r\n<br />", "<br />", $rss_description);
-	//$rss_description = str_replace ("<br />\n<br />", "<br />", $rss_description);
-	//$rss_description = str_replace ("<p>", "", $rss_description);
-	//$rss_description = str_replace ("</p>", "<br />", $rss_description);
-
-	$rss_img = check_str($_POST["rss_img"]);
-	$rss_optional_1 = check_str($_POST["rss_optional_1"]);
-	$rss_optional_2 = check_str($_POST["rss_optional_2"]);
-	//$rss_optional_3 = check_str($_POST["rss_optional_3"]);
-	//$rss_optional_4 = check_str($_POST["rss_optional_4"]);
-	//$rss_optional_5 = check_str($_POST["rss_optional_5"]);
-
-	//sql update
-	$sql  = "update v_rss set ";
-	$sql .= "rss_sub_category = '$rss_sub_category', ";
-	$sql .= "rss_title = '$rss_title', ";
-	$sql .= "rss_link = '$rss_link', ";
-	$sql .= "rss_description = '$rss_description', ";
-	$sql .= "rss_img = '$rss_img', ";
-	$sql .= "rss_optional_1 = '$rss_optional_1', ";
-	$sql .= "rss_optional_2 = '$rss_optional_2', ";
-	//$sql .= "rss_optional_3 = '$rss_optional_3', ";
-	//$sql .= "rss_optional_4 = '$rss_optional_4', ";
-	//$sql .= "rss_optional_5 = '$rss_optional_5', ";
-	//$sql .= "rss_add_date = '$rss_add_date', ";
-	$sql .= "rss_group = '$rss_group', ";
-	$sql .= "rss_order = '$rss_order' ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and rss_uuid = '$rss_uuid' ";
-	$sql .= "and rss_category = '$rss_category' ";
-	//echo $sql;
-	//return;
-	$count = $db->exec(check_sql($sql));
-	//echo $sql."<br>";
-	//echo "Affected Rows: ".$count;
-	//exit;
-
-	$_SESSION["message"] = $text['message-update'];
-	header("Location: rsslist.php");
-	return;
-}
-else {
-	//get data from the db
-	$rss_uuid = $_GET["rss_uuid"];
-
-	$sql = "";
-	$sql .= "select * from v_rss ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and rss_uuid = '$rss_uuid' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	foreach ($result as &$row) {
-		$rss_category = $row["rss_category"];
-		$rss_sub_category = $row["rss_sub_category"];
-		$rss_optional_1 = $row["rss_optional_1"];
-		$rss_title = $row["rss_title"];
-		$rss_link = $row["rss_link"];
-		$rss_description = $row["rss_description"];
-
-		if ($rss_optional_1 == "text/html") { //type
-			$rss_description = htmlentities($rss_description);
-		}
-
-		$rss_img = $row["rss_img"];
-		$rss_optional_2 = $row["rss_optional_2"];
-		$rss_optional_3 = $row["rss_optional_3"];
-		$rss_optional_4 = $row["rss_optional_4"];
-		$rss_optional_5 = $row["rss_optional_5"];
-		$rss_add_date = $row["rss_add_date"];
-		$rss_add_user = $row["rss_add_user"];
-		$rss_group = $row["rss_group"];
-		$rss_order = $row["rss_order"];
-		//$rss_description = str_replace ("\r\n", "<br>", $rss_description);
-
-		//echo $rss_description;
-		//return;
-
-		break; //limit to 1 row
-	}
-}
-
-	require_once "resources/header.php";
-	if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/tiny_mce')) {
-		if ($rss_optional_1 == "text/html") {
-			require_once "resources/wysiwyg.php";
-		}
-	}
-	else {
-		//--- Begin: Edit Area -----------------------------------------------------
-			echo "    <script language=\"javascript\" type=\"text/javascript\" src=\"".PROJECT_PATH."/resources/edit_area/edit_area_full.js\"></script>\n";
-			echo "    <!-- -->\n";
-
-			echo "	<script language=\"Javascript\" type=\"text/javascript\">\n";
-			echo "		editAreaLoader.init({\n";
-			echo "			id: \"rss_description\" // id of the textarea to transform //, |, help\n";
-			echo "			,start_highlight: true\n";
-			echo "			,font_size: \"8\"\n";
-			echo "			,allow_toggle: false\n";
-			echo "			,language: \"en\"\n";
-			echo "			,syntax: \"html\"\n";
-			echo "			,toolbar: \"search, go_to_line,|, fullscreen, |, undo, redo, |, select_font, |, syntax_selection, |, change_smooth_selection, highlight, reset_highlight, |, help\" //new_document,\n";
-			echo "			,plugins: \"charmap\"\n";
-			echo "			,charmap_default: \"arrows\"\n";
-			echo "    });\n";
-			echo "    </script>";
-		//--- End: Edit Area -------------------------------------------------------
-	}
-
-	echo "<form method='post' action=''>";
-	echo "<table width='100%' cellpadding='0' cellspacing='0'>";
-	echo "<tr>\n";
-	echo "<td width='30%' nowrap valign='top'><b>".$text['label-content-edit']."</b></td>\n";
-	echo "<td width='70%' align='right' valign='top'><input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='rsslist.php'\" value='".$text['button-back']."'><br /><br /></td>\n";
-	echo "</tr>\n";
-
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Category</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_category' value='$rss_category'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq' nowrap>Sub Category</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_sub_category' value='$rss_sub_category'></td>";
-	//echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td width='30%' class='vncellreq' nowrap>".$text['label-title']."</td>";
-	echo "		<td width='70%' class='vtable' width='100%'><input type='text' class='formfld' name='rss_title' value='$rss_title'></td>";
-	echo "	</tr>";
-	echo "	<tr>";
-	echo "		<td class='vncellreq'>".$text['label-link']."</td>";
-	echo "		<td class='vtable'><input type='text' class='formfld' name='rss_link' value='$rss_link'></td>";
-	echo "	</tr>";
-
-	echo "	<tr>";
-	echo "		<td class='vncellreq'>".$text['label-group']."</td>";
-	echo "		<td class='vtable'>";
-	//echo "            <input type='text' class='formfld' name='menuparentid' value='$menuparentid'>";
-
-	//---- Begin Select List --------------------
-	$sql = "SELECT * FROM v_groups ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "order by group_name asc ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-
-	echo "<select name=\"rss_group\" class='formfld'>\n";
-	echo "<option value=\"\">public</option>\n";
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	//$count = count($result);
-	foreach($result as $field) {
-			if ($rss_group == $field[group_name]) {
-				echo "<option value='".$field[group_name]."' selected>".$field[group_name]."</option>\n";
-			}
-			else {
-				echo "<option value='".$field[group_name]."'>".$field[group_name]."</option>\n";
-			}
-	}
-
-	echo "</select>";
-	unset($sql, $result);
-	//---- End Select List --------------------
-
-	echo "        </td>";
-	echo "	</tr>";
-
-	/*
-	echo "	<tr>\n";
-	echo "	<td width='20%' class=\"vncell\" style='text-align: left;'>\n";
-	echo "		Template: \n";
-	echo "	</td>\n";
-	echo "	<td class=\"vtable\">\n";
-	echo "<select id='rss_sub_category' name='rss_sub_category' class='formfld' style=''>\n";
-	echo "<option value=''></option>\n";
-	$theme_dir = $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes';
-	if ($handle = opendir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/themes')) {
-		while (false !== ($file = readdir($handle))) {
-			if ($file != "." && $file != ".." && $file != ".svn" && is_dir($theme_dir.'/'.$file)) {
-				if ($file == $rss_sub_category) {
-					echo "<option value='$file' selected='selected'>$file</option>\n";
-				}
-				else {
-					echo "<option value='$file'>$file</option>\n";
-				}
-			}
-		}
-		closedir($handle);
-	}
-	echo "	</select>\n";
-	echo "	<br />\n";
-	echo "	Select a template to set as the default and then press save.<br />\n";
-	echo "	</td>\n";
-	echo "	</tr>\n";
-	*/
-
-	echo "	<tr>";
-	echo "		<td class='vncellreq'>".$text['label-type']."</td>";
-	echo "		<td class='vtable'>";
-	echo "            <select name=\"rss_optional_1\" class='formfld'>\n";
-	if ($rss_optional_1 == "text/html") { echo "<option value=\"text/html\" selected>text/html</option>\n"; }
-	else { echo "<option value=\"text/html\">text/html</option>\n"; }
-
-	if ($rss_optional_1 == "text/javascript") { echo "<option value=\"text/javascript\" selected>text/javascript</option>\n"; }
-	else { echo "<option value=\"text/javascript\">text/javascript</option>\n"; }
-	echo "            </select>";
-	echo "        </td>";
-	echo "	</tr>";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "    ".$text['label-order']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "              <select name='rss_order' class='formfld'>\n";
-	if (strlen(htmlspecialchars($rss_order))> 0) {
-		echo "              <option selected='yes' value='".htmlspecialchars($rss_order)."'>".htmlspecialchars($rss_order)."</option>\n";
-	}
-	$i=0;
-	while($i<=999) {
-		if (strlen($i) == 1) {
-			echo "              <option value='00$i'>00$i</option>\n";
-		}
-		if (strlen($i) == 2) {
-			echo "              <option value='0$i'>0$i</option>\n";
-		}
-		if (strlen($i) == 3) {
-			echo "              <option value='$i'>$i</option>\n";
-		}
-		$i++;
-	}
-	echo "              </select>\n";
-	echo "<br />\n";
-	echo "\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "	<tr>";
-	echo "		<td  class='' colspan='2' align='left'>";
-	echo "            <strong>".$text['label-content'].":</strong> ";
-	if ($rss_optional_1 == "text/html") {
-		if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/resources/tiny_mce')) {
-			echo "            &nbsp; &nbsp; &nbsp; editor &nbsp; <a href='#' title='toggle' onclick=\"toogleEditorMode('rss_description'); return false;\">".$text['label-on-off']."</a><br>";
-		}
-		echo "            <textarea name='rss_description'  id='rss_description' class='formfld' cols='20' style='width: 100%' rows='12' >$rss_description</textarea>";
-	}
-	if ($rss_optional_1 == "text/javascript") {
-		echo "            <textarea name='rss_description'  id='rss_description' class='formfld' cols='20' style='width: 100%' rows='12' ></textarea>";
-	}
-	echo "        </td>";
-	echo "	</tr>";
-
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Image</td>";
-	//echo "		<td class='vtable'><input type='text' name='rss_img' value='$rss_img'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Priority</td>";
-	//echo "		<td class='vtable'>";
-	//echo "            <input type='text' name='rss_optional_1' value='$rss_optional_1'>";
-	//echo "            <select name=\"rss_optional_1\" class='formfld'>\n";
-	//echo "            <option value=\"$rss_optional_1\">$rss_optional_1</option>\n";
-	//echo "            <option value=\"\"></option>\n";
-	//echo "            <option value=\"low\">low</option>\n";
-	//echo "            <option value=\"med\">med</option>\n";
-	//echo "            <option value=\"high\">high</option>\n";
-	//echo "            </select>";
-	//echo "        </td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Status</td>";
-	//echo "		<td class='vtable'>";
-	//echo "            <input type='text' name='rss_optional_2' value='$rss_optional_2'>";
-	//echo "            <select name=\"rss_optional_2\" class=\"formfld\">\n";
-	//echo "            <option value=\"$rss_optional_2\">$rss_optional_2</option>\n";
-	//echo "            <option value=\"\"></option>\n";
-	//echo "            <option value=\"0\">0</option>\n";
-	//echo "            <option value=\"10\">10</option>\n";
-	//echo "            <option value=\"20\">20</option>\n";
-	//echo "            <option value=\"30\">30</option>\n";
-	//echo "            <option value=\"40\">40</option>\n";
-	//echo "            <option value=\"50\">50</option>\n";
-	//echo "            <option value=\"60\">60</option>\n";
-	//echo "            <option value=\"70\">70</option>\n";
-	//echo "            <option value=\"80\">80</option>\n";
-	//echo "            <option value=\"90\">90</option>\n";
-	//echo "            <option value=\"100\">100</option>\n";
-	//echo "            </select>";
-	//echo "        </td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Optional 3</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_optional_3' value='$rss_optional_3'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>Optional 4</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_optional_4' value='$rss_optional_4'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>rss_optional_5</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_optional_5' value='$rss_optional_5'></td>";
-	//echo "	</tr>";
-	//echo "	<tr>";
-	//echo "		<td class='vncellreq'>rss_add_date</td>";
-	//echo "		<td class='vtable'><input type='text' class='formfld' name='rss_add_date' value='$rss_add_date'></td>";
-	//echo "	</tr>";
-
-	echo "	<tr>";
-	echo "		<td class='' colspan='2' align='right'>";
-	//echo "<input type=\"button\" value=\"Load\" onclick=\"document.getElementById('rss_description').innerHTML = ajaxresponse;\" />";
-	//echo "<input type=\"button\" value=\"Load\" onclick=\"ajaxLoad('rss_description', ajaxresponse);\" />";
-
-	echo "          <input type='hidden' name='rss_uuid' value='$rss_uuid'>";
-	echo "			<br><br>";
-	echo "          <input type='submit' class='btn' name='submit' value='".$text['button-save']."'>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
-	echo "<br><br>";
-	echo "</form>";
-
-	if ($rss_optional_1 == "text/javascript") {
-		echo "<script type=\"text/javascript\" language=\"javascript\">\n";
-		echo "  document.getElementById('rss_description').innerHTML = ajaxresponse;\n";
-		echo "</script>\n";
-	}
-
-
-  require_once "resources/footer.php";
-?>