repaired previous errors inserted in r4614 : reinserted 'de-de' instead 'de' and correct files. keeps fr-ca to report in app_config.php files

core/apps/app_config.php

@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = '';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de'] = '';
+		$apps[$x]['description']['de-de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = '';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'App Manager';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de'] = '';
+		$apps[$x]['menu'][0]['title']['de-de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Gestion App';

core/databases/app_config.php

@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Storeds database connection information.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de'] = '';
+		$apps[$x]['description']['de-de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = 'Information de connexions au BDD';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Databases';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de'] = '';
+		$apps[$x]['menu'][0]['title']['de-de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'BDD';
@@ -36,17 +36,18 @@
 		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'database_view';
-		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][1]['name'] = 'database_add';
-		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][2]['name'] = 'database_edit';
-		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][3]['name'] = 'database_delete';
-		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+		$y = 0;
+                $apps[$x]['permissions'][$y]['name'] = 'database_view';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'database_add';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'database_edit';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'database_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 
 	//schema details
 		$y = 0; //table array index

core/default_settings/app_config.php

@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Default settings that apply to all domains.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de'] = '';
+		$apps[$x]['description']['de-de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = 'Configurations par défaut applicable à tous les domaines';
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Default Settings';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de'] = '';
+		$apps[$x]['menu'][0]['title']['de-de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Confs par Défaut';

core/default_settings/app_languages.php

@@ -21,8 +21,8 @@
 		$text['title-default_setting-edit']['fr-fr'] = 'Editer les Configurations par Défaut';
 
 		$text['header-default_setting-edit']['en-us'] = 'Default Setting Edit';
-		$text['header-default_setting-edit']['pt-pt'] = 'Editer les Configurations par Défaut';
-		$text['header-default_setting-edit']['fr-fr'] = '';
+		$text['header-default_setting-edit']['pt-pt'] = '';
+		$text['header-default_setting-edit']['fr-fr'] = 'Editer les Configurations par Défaut';
 
 		$text['description-default_setting-edit']['en-us'] = 'Settings used for all domains.';
 		$text['description-default_setting-edit']['pt-pt'] = '';

core/domain_settings/app_config.php

@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Manage a single domain or multiple domains for multi-tenant.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de'] = '';
+		$apps[$x]['description']['de-de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "Gestion d'un domaine ou plusieurs dans le cas d'un système multi-parties.";
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Domains';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de'] = '';
+		$apps[$x]['menu'][0]['title']['de-de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'domaines';

core/menu/app_config.php

@@ -1,323 +1,364 @@
 <?php
-	//application details
-		$apps[$x]['name'] = "Menu Manager";
-		$apps[$x]['uuid'] = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
-		$apps[$x]['category'] = 'Core';
-		$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'] = 'The menu can be customized using this tool.';
-		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de'] = '';
-		$apps[$x]['description']['de-ch'] = '';
-		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = 'Le menu peut être personnalisé ici';
-		$apps[$x]['description']['fr-ca'] = '';
-		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = 'O menu pode ser personalizado usando esta ferramenta.';
-		$apps[$x]['description']['pt-br'] = '';
+        //application details
+                $apps[$x]['name'] = "Menu Manager";
+                $apps[$x]['uuid'] = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
+                $apps[$x]['category'] = 'Core';
+                $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'] = 'The menu can be customized using this tool.';
+                $apps[$x]['description']['es-mx'] = '';
+                $apps[$x]['description']['de-de'] = '';
+                $apps[$x]['description']['de-ch'] = '';
+                $apps[$x]['description']['de-at'] = '';
+                $apps[$x]['description']['fr-fr'] = "Le menu peut être personnalisé ici";
+                $apps[$x]['description']['fr-ca'] = '';
+                $apps[$x]['description']['fr-ch'] = '';
+                $apps[$x]['description']['pt-pt'] = "O menu pode ser personalizado usando esta ferramenta.";
+                $apps[$x]['description']['pt-br'] = '';
 
-	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Menu Manager';
-		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de'] = '';
-		$apps[$x]['menu'][0]['title']['de-ch'] = '';
-		$apps[$x]['menu'][0]['title']['de-at'] = '';
-		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Gestion des Menus';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Gestor de Menus';
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = 'da3a9ab4-c28e-ea8d-50cc-e8405ac8e76e';
-		$apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/core/menu/menu.php';
+        //menu details
+                $apps[$x]['menu'][0]['title']['en-us'] = "Menu Manager";
+                $apps[$x]['menu'][0]['title']['es-mx'] = '';
+                $apps[$x]['menu'][0]['title']['de-de'] = '';
+                $apps[$x]['menu'][0]['title']['de-ch'] = '';
+                $apps[$x]['menu'][0]['title']['de-at'] = '';
+                $apps[$x]['menu'][0]['title']['fr-fr'] = "Gestion des Menus";
+                $apps[$x]['menu'][0]['title']['fr-ca'] = '';
+                $apps[$x]['menu'][0]['title']['fr-ch'] = '';
+                $apps[$x]['menu'][0]['title']['pt-pt'] = "Gestor de Menus";
+                $apps[$x]['menu'][0]['title']['pt-br'] = '';
+                $apps[$x]['menu'][0]['uuid'] = 'da3a9ab4-c28e-ea8d-50cc-e8405ac8e76e';
+                $apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
+                $apps[$x]['menu'][0]['category'] = 'internal';
+                $apps[$x]['menu'][0]['path'] = '/core/menu/menu.php';
+                $apps[$x]['menu'][0]['groups'][] = 'superadmin';
 
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+                $apps[$x]['menu'][1]['title']['en-us'] = 'System';
+                $apps[$x]['menu'][1]['title']['es-mx'] = '';
+                $apps[$x]['menu'][1]['title']['de-de'] = '';
+                $apps[$x]['menu'][1]['title']['de-ch'] = '';
+                $apps[$x]['menu'][1]['title']['de-at'] = '';
+                $apps[$x]['menu'][1]['title']['fr-fr'] = 'Système';
+                $apps[$x]['menu'][1]['title']['fr-ca'] = '';
+                $apps[$x]['menu'][1]['title']['fr-ch'] = '';
+                $apps[$x]['menu'][1]['title']['pt-pt'] = 'Sistema';
+                $apps[$x]['menu'][1]['title']['pt-br'] = '';
+                $apps[$x]['menu'][1]['uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
+                $apps[$x]['menu'][1]['parent_uuid'] = '';
+                $apps[$x]['menu'][1]['category'] = 'internal';
+                $apps[$x]['menu'][1]['path'] = '/core/user_settings/user_dashboard.php';
+                $apps[$x]['menu'][1]['order'] = '5';
+                $apps[$x]['menu'][1]['groups'][] = 'user';
+                $apps[$x]['menu'][1]['groups'][] = 'admin';
+                $apps[$x]['menu'][1]['groups'][] = 'superadmin';
 
-		$apps[$x]['menu'][1]['title']['en-us'] = 'System';
-		$apps[$x]['menu'][1]['title']['es-mx'] = '';
-		$apps[$x]['menu'][1]['title']['de'] = '';
-		$apps[$x]['menu'][1]['title']['de-ch'] = '';
-		$apps[$x]['menu'][1]['title']['de-at'] = '';
-		$apps[$x]['menu'][1]['title']['fr-fr'] = 'Système';
-		$apps[$x]['menu'][1]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][1]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][1]['title']['pt-pt'] = 'Sistema';
-		$apps[$x]['menu'][1]['title']['pt-br'] = '';
-		$apps[$x]['menu'][1]['uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
-		$apps[$x]['menu'][1]['parent_uuid'] = '';
-		$apps[$x]['menu'][1]['category'] = 'internal';
-		$apps[$x]['menu'][1]['path'] = '/core/user_settings/user_dashboard.php';
-		$apps[$x]['menu'][1]['order'] = '5';
-		$apps[$x]['menu'][1]['groups'][] = 'user';
-		$apps[$x]['menu'][1]['groups'][] = 'admin';
-		$apps[$x]['menu'][1]['groups'][] = 'superadmin';
+                $apps[$x]['menu'][2]['title']['en-us'] = 'Accounts';
+                $apps[$x]['menu'][2]['title']['es-mx'] = '';
+                $apps[$x]['menu'][2]['title']['de-de'] = '';
+                $apps[$x]['menu'][2]['title']['de-ch'] = '';
+                $apps[$x]['menu'][2]['title']['de-at'] = '';
+                $apps[$x]['menu'][2]['title']['fr-fr'] = 'Comptes';
+                $apps[$x]['menu'][2]['title']['fr-ca'] = '';
+                $apps[$x]['menu'][2]['title']['fr-ch'] = '';
+                $apps[$x]['menu'][2]['title']['pt-pt'] = 'Contas';
+                $apps[$x]['menu'][2]['title']['pt-br'] = '';
+                $apps[$x]['menu'][2]['uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55';
+                $apps[$x]['menu'][2]['parent_uuid'] = '';
+                $apps[$x]['menu'][2]['category'] = 'internal';
+                $apps[$x]['menu'][2]['path'] = '/core/users/index.php';
+                $apps[$x]['menu'][2]['order'] = '10';
+                $apps[$x]['menu'][2]['groups'][] = 'admin';
+                $apps[$x]['menu'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['menu'][2]['title']['en-us'] = 'Accounts';
-		$apps[$x]['menu'][2]['title']['es-mx'] = '';
-		$apps[$x]['menu'][2]['title']['de'] = '';
-		$apps[$x]['menu'][2]['title']['de-ch'] = '';
-		$apps[$x]['menu'][2]['title']['de-at'] = '';
-		$apps[$x]['menu'][2]['title']['fr-fr'] = 'Comptes';
-		$apps[$x]['menu'][2]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][2]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][2]['title']['pt-pt'] = 'Contas';
-		$apps[$x]['menu'][2]['title']['pt-br'] = '';
-		$apps[$x]['menu'][2]['uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55';
-		$apps[$x]['menu'][2]['parent_uuid'] = '';
-		$apps[$x]['menu'][2]['category'] = 'internal';
-		$apps[$x]['menu'][2]['path'] = '/app/extensions/extensions.php';
-		$apps[$x]['menu'][2]['order'] = '10';
-		$apps[$x]['menu'][2]['groups'][] = 'admin';
-		$apps[$x]['menu'][2]['groups'][] = 'superadmin';
+                if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/vars/app_config.php")) {
+                        $apps[$x]['menu'][3]['title']['en-us'] = 'Dialplan';
+                        $apps[$x]['menu'][3]['uuid'] = 'b94e8bd9-9eb5-e427-9c26-ff7a6c21552a';
+                        $apps[$x]['menu'][3]['parent_uuid'] = '';
+                        $apps[$x]['menu'][3]['category'] = 'internal';
+                        $apps[$x]['menu'][3]['path'] = '/app/dialplan/dialplans.php';
+                        $apps[$x]['menu'][3]['order'] = '15';
+                        $apps[$x]['menu'][3]['groups'][] = 'admin';
+                        $apps[$x]['menu'][3]['groups'][] = 'superadmin';
+                }
 
-		$apps[$x]['menu'][3]['title']['en-us'] = 'Dialplan2';
-		$apps[$x]['menu'][3]['uuid'] = 'b94e8bd9-9eb5-e427-9c26-ff7a6c21552a';
-		$apps[$x]['menu'][3]['parent_uuid'] = '';
-		$apps[$x]['menu'][3]['category'] = 'internal';
-		$apps[$x]['menu'][3]['path'] = '/app/dialplan/dialplans.php';
-		$apps[$x]['menu'][3]['order'] = '15';
-		$apps[$x]['menu'][3]['groups'][] = 'admin';
-		$apps[$x]['menu'][3]['groups'][] = 'superadmin';
+                if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/calls_active/calls_active_extensions.php")) {
+                        $apps[$x]['menu'][4]['title']['en-us'] = 'Status';
+                        $apps[$x]['menu'][4]['title']['es-mx'] = '';
+                        $apps[$x]['menu'][4]['title']['de-de'] = '';
+                        $apps[$x]['menu'][4]['title']['de-ch'] = '';
+                        $apps[$x]['menu'][4]['title']['de-at'] = '';
+                        $apps[$x]['menu'][4]['title']['fr-fr'] = 'Etat';
+                        $apps[$x]['menu'][4]['title']['fr-ca'] = '';
+                        $apps[$x]['menu'][4]['title']['fr-ch'] = '';
+                        $apps[$x]['menu'][4]['title']['pt-pt'] = 'Estado';
+                        $apps[$x]['menu'][4]['title']['pt-br'] = '';
+                        $apps[$x]['menu'][4]['uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
+                        $apps[$x]['menu'][4]['parent_uuid'] = '';
+                        $apps[$x]['menu'][4]['category'] = 'internal';
+                        $apps[$x]['menu'][4]['path'] = '/app/calls_active/calls_active_extensions.php';
+                        $apps[$x]['menu'][4]['order'] = '25';
+                        $apps[$x]['menu'][4]['groups'][] = 'user';
+                        $apps[$x]['menu'][4]['groups'][] = 'admin';
+                        $apps[$x]['menu'][4]['groups'][] = 'superadmin';
+                }
 
-		$apps[$x]['menu'][4]['title']['en-us'] = 'Status';
-		$apps[$x]['menu'][4]['title']['es-mx'] = '';
-		$apps[$x]['menu'][4]['title']['de'] = '';
-		$apps[$x]['menu'][4]['title']['de-ch'] = '';
-		$apps[$x]['menu'][4]['title']['de-at'] = '';
-		$apps[$x]['menu'][4]['title']['fr-fr'] = 'Etat';
-		$apps[$x]['menu'][4]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][4]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][4]['title']['pt-pt'] = 'Estado';
-		$apps[$x]['menu'][4]['title']['pt-br'] = '';
-		$apps[$x]['menu'][4]['uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
-		$apps[$x]['menu'][4]['parent_uuid'] = '';
-		$apps[$x]['menu'][4]['category'] = 'internal';
-		$apps[$x]['menu'][4]['path'] = '/app/calls_active/calls_active_extensions.php';
-		$apps[$x]['menu'][4]['order'] = '25';
-		$apps[$x]['menu'][4]['groups'][] = 'user';
-		$apps[$x]['menu'][4]['groups'][] = 'admin';
-		$apps[$x]['menu'][4]['groups'][] = 'superadmin';
+                $apps[$x]['menu'][5]['title']['en-us'] = 'Advanced';
+                $apps[$x]['menu'][5]['title']['es-mx'] = '';
+                $apps[$x]['menu'][5]['title']['de-de'] = '';
+                $apps[$x]['menu'][5]['title']['de-ch'] = '';
+                $apps[$x]['menu'][5]['title']['de-at'] = '';
+                $apps[$x]['menu'][5]['title']['fr-fr'] = 'Avancé';
+                $apps[$x]['menu'][5]['title']['fr-ca'] = '';
+                $apps[$x]['menu'][5]['title']['fr-ch'] = '';
+                $apps[$x]['menu'][5]['title']['pt-pt'] = 'Avançado';
+                $apps[$x]['menu'][5]['title']['pt-br'] = '';
+                $apps[$x]['menu'][5]['uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
+                $apps[$x]['menu'][5]['parent_uuid'] = '';
+                $apps[$x]['menu'][5]['category'] = 'internal';
+                $apps[$x]['menu'][5]['path'] = '/core/domain_settings/domains.php';
+                $apps[$x]['menu'][5]['order'] = '30';
+                $apps[$x]['menu'][5]['groups'][] = 'superadmin';
 
-		$apps[$x]['menu'][5]['title']['en-us'] = 'Advanced';
-		$apps[$x]['menu'][5]['title']['es-mx'] = '';
-		$apps[$x]['menu'][5]['title']['de'] = '';
-		$apps[$x]['menu'][5]['title']['de-ch'] = '';
-		$apps[$x]['menu'][5]['title']['de-at'] = '';
-		$apps[$x]['menu'][5]['title']['fr-fr'] = 'Avancé';
-		$apps[$x]['menu'][5]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][5]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][5]['title']['pt-pt'] = 'Avançado';
-		$apps[$x]['menu'][5]['title']['pt-br'] = '';
-		$apps[$x]['menu'][5]['uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][5]['parent_uuid'] = '';
-		$apps[$x]['menu'][5]['category'] = 'internal';
-		$apps[$x]['menu'][5]['path'] = '/app/exec/exec.php';
-		$apps[$x]['menu'][5]['order'] = '30';
-		$apps[$x]['menu'][5]['groups'][] = 'superadmin';
+        //permission details
+                $y = 0;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_view';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_add';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_edit';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_restore';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_item_view';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_item_add';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_item_edit';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_item_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_item_group_view';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_item_group_add';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_item_group_edit';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_item_group_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_language_view';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_language_add';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_language_edit';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'menu_language_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 
-	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'menu_view';
-		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+        //schema details
+                $y = 0; //table array index
+                $z = 0; //field array index
+                $apps[$x]['db'][$y]['table'] = 'v_menus';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_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]['deprecated'] = 'true';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
+                $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'] = 'menu_name';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the name of the menu.';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_language';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the language.';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_description';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_desc';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
+                $z++;
 
-		$apps[$x]['permissions'][1]['name'] = 'menu_add';
-		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+                $y = 1; //table array index
+                $z = 0; //field array index
+                $apps[$x]['db'][$y]['table'] = 'v_menu_items';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_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']['text'] = 'menu_item_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_guid';
+                $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']['text'] = 'menu_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
+                $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_menus';
+                $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_parent_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_parent_guid';
+                $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]['description']['en-us'] = '';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_title';
+                $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'] = 'menu_item_link';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_str';
+                $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'] = 'menu_item_category';
+                $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'] = 'menu_item_protected';
+                $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'] = 'menu_item_order';
+                $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'] = 'menu_item_description';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_desc';
+               
+                $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'] = 'menu_item_add_user';
+                $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'] = 'menu_item_add_date';
+                $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'] = 'menu_item_mod_user';
+                $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'] = 'menu_item_mod_date';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-		$apps[$x]['permissions'][2]['name'] = 'menu_edit';
-		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+                $y = 2; //table array index
+                $z = 0; //field array index
+                $apps[$x]['db'][$y]['table'] = 'v_menu_item_groups';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_group_name';
+                $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]['key']['type'] = 'primary';
+                $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'] = 'menu_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
+                $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_menus';
+                $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_guid';
+                $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_menu_items';
+                $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_item_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_name';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+               
 
-		$apps[$x]['permissions'][3]['name'] = 'menu_delete';
-		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][4]['name'] = 'menu_restore';
-		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
-
-	//schema details
-		$y = 0; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_menus';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_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]['deprecated'] = 'true';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
-		$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'] = 'menu_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the name of the menu.';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_language';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the language.';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_description';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_desc';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
-		$z++;
-
-		$y = 1; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_menu_items';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_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']['text'] = 'menu_item_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_guid';
-		$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']['text'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
-		$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_menus';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_parent_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_parent_guid';
-		$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]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_title';
-		$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'] = 'menu_item_link';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_str';
-		$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'] = 'menu_item_category';
-		$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'] = 'menu_item_protected';
-		$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'] = 'menu_item_order';
-		$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'] = 'menu_item_description';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_desc';
-		
-		$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'] = 'menu_item_add_user';
-		$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'] = 'menu_item_add_date';
-		$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'] = 'menu_item_mod_user';
-		$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'] = 'menu_item_mod_date';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-
-		$y = 2; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_menu_item_groups';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_group_name';
-		$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]['key']['type'] = 'primary';
-		$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'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
-		$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_menus';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_guid';
-		$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_menu_items';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_item_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-
-		$y = 3; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_menu_languages';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_language_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']['text'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
-		$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_menus';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_guid';
-		$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_menu_items';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_item_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_language';
-		$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'] = 'menu_item_title';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+                $y = 3; //table array index
+                $z = 0; //field array index
+                $apps[$x]['db'][$y]['table'] = 'v_menu_languages';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_language_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']['text'] = 'menu_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
+                $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_menus';
+                $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_guid';
+                $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_menu_items';
+                $apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_item_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_language';
+                $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'] = 'menu_item_title';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
 ?>

core/upgrade/app_config.php

@@ -8,7 +8,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'Upgrade the database schema.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de'] = '';
+		$apps[$x]['description']['de-de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = 'Mise à jour du Schéma de la base de données';
@@ -20,7 +20,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Upgrade Schema';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de'] = '';
+		$apps[$x]['menu'][0]['title']['de-de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'MàJ BDD';

core/user_settings/app_config.php

@@ -9,7 +9,7 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = 'User account settings can be changed by the user.';
 		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de'] = '';
+		$apps[$x]['description']['de-de'] = '';
 		$apps[$x]['description']['de-ch'] = '';
 		$apps[$x]['description']['de-at'] = '';
 		$apps[$x]['description']['fr-fr'] = "L'usager peut modifier la configuration de son compte";
@@ -21,7 +21,7 @@
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = 'Account Settings';
 		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de'] = '';
+		$apps[$x]['menu'][0]['title']['de-de'] = '';
 		$apps[$x]['menu'][0]['title']['de-ch'] = '';
 		$apps[$x]['menu'][0]['title']['de-at'] = '';
 		$apps[$x]['menu'][0]['title']['fr-fr'] = 'Confs du Compte';

core/users/app_config.php

@@ -1,380 +1,440 @@
 <?php
-	//application details
-		$apps[$x]['name'] = "User Manager";
-		$apps[$x]['uuid'] = '112124b3-95c2-5352-7e9d-d14c0b88f207';
-		$apps[$x]['category'] = 'Core';
-		$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'] = 'Add, edit, delete, and search for users.';
-		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de'] = '';
-		$apps[$x]['description']['de-ch'] = '';
-		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = 'Ajouter, Editer, Supprimer et Chercher des Usagers';
-		$apps[$x]['description']['fr-ca'] = '';
-		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = 'Adicionar, editar, apagar e pesquisa pelos utilizadores.';
-		$apps[$x]['description']['pt-br'] = '';
+        //application details
+                $apps[$x]['name'] = "User Manager";
+                $apps[$x]['uuid'] = '112124b3-95c2-5352-7e9d-d14c0b88f207';
+                $apps[$x]['category'] = 'Core';
+                $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'] = 'Add, edit, delete, and search for users.';
+                $apps[$x]['description']['es-mx'] = '';
+                $apps[$x]['description']['de-de'] = '';
+                $apps[$x]['description']['de-ch'] = '';
+                $apps[$x]['description']['de-at'] = '';
+                $apps[$x]['description']['fr-fr'] = "Ajouter, Editer, Supprimer et Chercher des Usagers";
+                $apps[$x]['description']['fr-ca'] = '';
+                $apps[$x]['description']['fr-ch'] = '';
+                $apps[$x]['description']['pt-pt'] = 'Adicionar, editar, apagar e pesquisa pelos utilizadores.';
+                $apps[$x]['description']['pt-br'] = '';
 
-		$apps[$x]['menu'][2]['title']['en-us'] = 'User Manager';
-		$apps[$x]['menu'][2]['title']['es-mx'] = '';
-		$apps[$x]['menu'][2]['title']['de'] = '';
-		$apps[$x]['menu'][2]['title']['de-ch'] = '';
-		$apps[$x]['menu'][2]['title']['de-at'] = '';
-		$apps[$x]['menu'][2]['title']['fr-fr'] = 'Gestion Usagers';
-		$apps[$x]['menu'][2]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][2]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][2]['title']['pt-pt'] = 'Gestor de Utilizadores';
-		$apps[$x]['menu'][2]['title']['pt-br'] = '';
-		$apps[$x]['menu'][2]['uuid'] = '0d57cc1e-1874-47b9-7ddd-fe1f57cec99b';
-		$apps[$x]['menu'][2]['parent_uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55';
-		$apps[$x]['menu'][2]['category'] = 'internal';
-		$apps[$x]['menu'][2]['path'] = '/core/users/index.php';
-		$apps[$x]['menu'][2]['groups'][] = 'admin';
-		$apps[$x]['menu'][2]['groups'][] = 'superadmin';
+                $apps[$x]['menu'][2]['title']['en-us'] = "User Manager";
+                $apps[$x]['menu'][2]['title']['es-mx'] = '';
+                $apps[$x]['menu'][2]['title']['de-de'] = '';
+                $apps[$x]['menu'][2]['title']['de-ch'] = '';
+                $apps[$x]['menu'][2]['title']['de-at'] = '';
+                $apps[$x]['menu'][2]['title']['fr-fr'] = "Gestion Usagers";
+                $apps[$x]['menu'][2]['title']['fr-ca'] = '';
+                $apps[$x]['menu'][2]['title']['fr-ch'] = '';
+                $apps[$x]['menu'][2]['title']['pt-pt'] = "Gestor de Utilizadores";
+                $apps[$x]['menu'][2]['title']['pt-br'] = '';
+                $apps[$x]['menu'][2]['uuid'] = '0d57cc1e-1874-47b9-7ddd-fe1f57cec99b';
+                $apps[$x]['menu'][2]['parent_uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55';
+                $apps[$x]['menu'][2]['category'] = 'internal';
+                $apps[$x]['menu'][2]['path'] = '/core/users/index.php';
+                $apps[$x]['menu'][2]['groups'][] = 'admin';
+                $apps[$x]['menu'][2]['groups'][] = 'superadmin';
 
-		$apps[$x]['menu'][3]['title']['en-us'] = 'Group Manager';
-		$apps[$x]['menu'][3]['title']['es-mx'] = '';
-		$apps[$x]['menu'][3]['title']['de'] = '';
-		$apps[$x]['menu'][3]['title']['de-ch'] = '';
-		$apps[$x]['menu'][3]['title']['de-at'] = '';
-		$apps[$x]['menu'][3]['title']['fr-fr'] = 'Gestion Groupes';
-		$apps[$x]['menu'][3]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][3]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][3]['title']['pt-pt'] = 'Gestor de Grupos';
-		$apps[$x]['menu'][3]['title']['pt-br'] = '';
-		$apps[$x]['menu'][3]['uuid'] = '3b4acc6d-827b-f537-bf21-0093d94ffec7';
-		$apps[$x]['menu'][3]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][3]['category'] = 'internal';
-		$apps[$x]['menu'][3]['path'] = '/core/users/groups.php';
-		$apps[$x]['menu'][3]['groups'][] = 'superadmin';
+                $apps[$x]['menu'][3]['title']['en-us'] = "Group Manager";
+                $apps[$x]['menu'][3]['title']['es-mx'] = '';
+                $apps[$x]['menu'][3]['title']['de-de'] = '';
+                $apps[$x]['menu'][3]['title']['de-ch'] = '';
+                $apps[$x]['menu'][3]['title']['de-at'] = '';
+                $apps[$x]['menu'][3]['title']['fr-fr'] = "Gestion Groupes";
+                $apps[$x]['menu'][3]['title']['fr-ca'] = '';
+                $apps[$x]['menu'][3]['title']['fr-ch'] = '';
+                $apps[$x]['menu'][3]['title']['pt-pt'] ="'Gestor de Grupos";
+                $apps[$x]['menu'][3]['title']['pt-br'] = '';
+                $apps[$x]['menu'][3]['uuid'] = '3b4acc6d-827b-f537-bf21-0093d94ffec7';
+                $apps[$x]['menu'][3]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
+                $apps[$x]['menu'][3]['category'] = 'internal';
+                $apps[$x]['menu'][3]['path'] = '/core/users/groups.php';
+                $apps[$x]['menu'][3]['groups'][] = 'superadmin';
 
-	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'user_view';
-		$apps[$x]['permissions'][0]['groups'][] = 'admin';
-		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+        //permission details
+                $y = 0;
+                $apps[$x]['permissions'][$y]['name'] = 'user_view';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'user_add';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'user_edit';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'user_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_view';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_add';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_edit';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_member_view';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_member_add';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_member_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_permissions';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_user_view';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_user_add';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_user_edit';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_user_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_permission_view';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_permission_add';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_permission_edit';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'group_permission_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = 'user_setting_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'] = 'user_setting_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'] = 'user_setting_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'] = 'user_setting_delete';
+                $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'admin';
+                $apps[$x]['permissions'][$y]['groups'][] = 'user';
 
-		$apps[$x]['permissions'][1]['name'] = 'user_add';
-		$apps[$x]['permissions'][1]['groups'][] = 'admin';
-		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+        //schema details
+                $y = 0; //table array index
+                $z = 0; //field array index
+                $apps[$x]['db'][$y]['table'] = 'v_users';
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_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'] = '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'] = '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'] = 'username';
+                $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'] = 'password';
+                $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'] = 'salt';
+                $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'] = 'contact_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_contacts';
+                //$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'contact_uuid';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'user_email';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'useremail';
+                $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'] = 'user_status';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'userstatus';
+                $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'] = 'user_time_zone';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'usertimezone';
+                $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'] = 'api_key';
+                $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]['description']['en-us'] = '';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_enabled';
+                $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'] = 'add_user';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'user_add_user';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'useradduser';
+                $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'] = 'add_date';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'user_add_date';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'useradddate';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-		$apps[$x]['permissions'][2]['name'] = 'user_edit';
-		$apps[$x]['permissions'][2]['groups'][] = 'admin';
-		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
+                $y = 1; //table array index
+                $z = 0; //field array index
+                $apps[$x]['db'][$y]['table'] = 'v_groups';
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_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'] = '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'] = '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'] = 'group_name';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'groupid';
+                $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'] = 'group_protected';
+                $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'] = 'group_description';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'groupdesc';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 
-		$apps[$x]['permissions'][3]['name'] = 'user_delete';
-		$apps[$x]['permissions'][3]['groups'][] = 'admin';
-		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+                $y = 2; //table array index
+                $z = 0; //field array index
+                $apps[$x]['db'][$y]['table'] = 'v_group_users';
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = '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'] = 'group_user_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'] = 'group_name';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'groupid';
+                $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'] = 'group_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]['description']['en-us'] = '';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'username';
+                $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'] = 'user_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]['description']['en-us'] = '';
 
-		$apps[$x]['permissions'][4]['name'] = 'group_view';
-		$apps[$x]['permissions'][4]['groups'][] = 'admin';
-		$apps[$x]['permissions'][4]['groups'][] = 'superadmin';
+                $y = 3; //table array index
+                $z = 0; //field array index
+                $apps[$x]['db'][$y]['table'] = 'v_group_permissions';
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_permission_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']['text'] = 'id';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'group_permission_name';
+                $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'] = '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'] = 'permission_name';
+                $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'permission_id';
+                $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'] = 'group_name';
+                $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'] = 'group_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'] = '';
 
-		$apps[$x]['permissions'][5]['name'] = 'group_add';
-		$apps[$x]['permissions'][5]['groups'][] = 'admin';
-		$apps[$x]['permissions'][5]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][6]['name'] = 'group_edit';
-		$apps[$x]['permissions'][6]['groups'][] = 'admin';
-		$apps[$x]['permissions'][6]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][7]['name'] = 'group_delete';
-		$apps[$x]['permissions'][7]['groups'][] = 'admin';
-		$apps[$x]['permissions'][7]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][8]['name'] = 'group_member_view';
-		$apps[$x]['permissions'][8]['groups'][] = 'admin';
-		$apps[$x]['permissions'][8]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][9]['name'] = 'group_member_add';
-		$apps[$x]['permissions'][9]['groups'][] = 'admin';
-		$apps[$x]['permissions'][9]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][10]['name'] = 'group_member_delete';
-		$apps[$x]['permissions'][10]['groups'][] = 'admin';
-		$apps[$x]['permissions'][10]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][11]['name'] = 'group_permissions';
-		$apps[$x]['permissions'][11]['groups'][] = 'superadmin';
-
-	//schema details
-		$y = 0; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_users';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_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'] = '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'] = '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'] = 'username';
-		$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'] = 'password';
-		$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'] = 'salt';
-		$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'] = 'contact_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_contacts';
-		//$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'contact_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'user_email';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'useremail';
-		$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'] = 'user_status';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'userstatus';
-		$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'] = 'user_enabled';
-		$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'] = 'user_time_zone';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'usertimezone';
-		$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'] = 'add_user';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'user_add_user';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'useradduser';
-		$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'] = 'add_date';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'user_add_date';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'useradddate';
-		$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_groups';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_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'] = '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'] = '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'] = 'group_name';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'groupid';
-		$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'] = 'group_description';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'groupdesc';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-
-		$y = 2; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_group_users';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = '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'] = 'group_user_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'] = 'group_name';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'groupid';
-		$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'] = 'group_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]['description']['en-us'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'username';
-		$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'] = 'user_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]['description']['en-us'] = '';
-
-		$y = 3; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_group_permissions';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_permission_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']['text'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'group_permission_name';
-		$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'] = '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'] = 'permission_name';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'permission_id';
-		$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'] = 'group_name';
-		$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'] = 'group_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'] = '';
-
-		$y = 4; //table array index
-		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_user_settings';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_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';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_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]['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'] = 'user_setting_category';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the category.';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_subcategory';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the subcategory.';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the name.';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_value';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the value.';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_enabled';
-		$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'] = 'user_setting_description';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+                $y = 4; //table array index
+                $z = 0; //field array index
+                $apps[$x]['db'][$y]['table'] = 'v_user_settings';
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_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';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_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]['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'] = 'user_setting_category';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the category.';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_subcategory';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the subcategory.';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_name';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the name.';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_value';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the value.';
+                $z++;
+                $apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_enabled';
+                $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'] = 'user_setting_description';
+                $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+                $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
 ?>
+