Browse Source

Add the app_menu.php to the optional features.

Mark Crane 10 years ago
parent
commit
8ca29e220b

+ 0 - 8
cdr/app_config.php

@@ -9,14 +9,6 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en'] = 'Call detail records from CSV.';
 
-	//menu details
-		$apps[$x]['menu'][0]['title']['en'] = 'CDR CSV';
-		$apps[$x]['menu'][0]['uuid'] = '57d6bea3-edd3-13c8-e841-cc4cd852b905';
-		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/cdr/v_cdr.php';
-		$apps[$x]['menu'][0]['groups'][] = 'hidden';
-
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'cdr_csv_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';

+ 10 - 0
cdr/app_menu.php

@@ -0,0 +1,10 @@
+<?php
+
+	$apps[$x]['menu'][0]['title']['en'] = 'CDR CSV';
+	$apps[$x]['menu'][0]['uuid'] = '57d6bea3-edd3-13c8-e841-cc4cd852b905';
+	$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
+	$apps[$x]['menu'][0]['category'] = 'internal';
+	$apps[$x]['menu'][0]['path'] = '/app/cdr/v_cdr.php';
+	$apps[$x]['menu'][0]['groups'][] = 'hidden';
+
+?>

+ 0 - 50
features/root.php

@@ -1,50 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <[email protected]>
-*/
-
-// make sure the PATH_SEPARATOR is defined
-	if (!defined("PATH_SEPARATOR")) {
-		if ( strpos( $_ENV[ "OS" ], "Win" ) !== false ) { define("PATH_SEPARATOR", ";"); } else { define("PATH_SEPARATOR", ":"); }
-	}
-
-// make sure the document_root is set
-	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", "/", $_SERVER["SCRIPT_FILENAME"]);
-	$_SERVER["DOCUMENT_ROOT"] = str_replace($_SERVER["PHP_SELF"], "", $_SERVER["SCRIPT_FILENAME"]);
-	$_SERVER["DOCUMENT_ROOT"] = realpath($_SERVER["DOCUMENT_ROOT"]);
-	//echo "DOCUMENT_ROOT: ".$_SERVER["DOCUMENT_ROOT"]."<br />\n";
-	//echo "PHP_SELF: ".$_SERVER["PHP_SELF"]."<br />\n";
-	//echo "SCRIPT_FILENAME: ".$_SERVER["SCRIPT_FILENAME"]."<br />\n";
-
-// if the project directory exists then add it to the include path otherwise add the document root to the include path
-	if (is_dir($_SERVER["DOCUMENT_ROOT"].'/fusionpbx')){
-		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', '/fusionpbx'); }
-		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER["DOCUMENT_ROOT"].'/fusionpbx' );
-	}
-	else {
-		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', ''); }
-		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] );
-	}
-
-?>

+ 0 - 36
features/v_config.php

@@ -1,36 +0,0 @@
-<?php
-	/*
-	//application details
-		$apps[$x]['name'] = "Features";
-		$apps[$x]['uuid'] = '';
-		$apps[$x]['category'] = '';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['permissions'][] = '_delete';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['author_url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en'] = 'Will be depracted by the App Manager.';
-
-	//menu details
-		$apps[$x]['menu'][0]['title']['en'] = '';
-		$apps[$x]['menu'][0]['uuid'] = '';
-		$apps[$x]['menu'][0]['parent_uuid'] = '';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/zzz/zzz.php';
-		$apps[$x]['menu'][0]['groups'][] = 'admin';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-
-	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'zzz';
-		$apps[$x]['permissions'][0]['groups'][] = 'admin';
-		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][1]['name'] = 'zzz';
-		$apps[$x]['permissions'][1]['groups'][] = 'admin';
-		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][2]['name'] = 'zzz';
-		$apps[$x]['permissions'][2]['groups'][] = 'admin';
-		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
-	*/
-?>

+ 0 - 166
features/v_features.php

@@ -1,166 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <[email protected]>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (if_group("admin") || if_group("superadmin")) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-require_once "resources/header.php";
-
-?><br />
-
-<div align='center'>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-	 <td class="tabcont" align='left'>
-
-	<table width="100%" border="0" cellpadding="6" cellspacing="0">
-	  <tr>
-		<td><p><span class="vexpl"><span class="red"><strong>Features<br>
-			</strong></span>
-			Lists some of the features available with a descriptions and link.
-			</p></td>
-	  </tr>
-	</table>
-	<br />
-
-
-	<table width="100%" border="0" cellpadding="6" cellspacing="0">
-	<tr>
-	  <th colspan='2' align='left'>&nbsp;</th>
-	</tr>
-	<tr>
-		<td width='20%' class="vncell" style='text-align: center;'><a href='<?php echo PROJECT_PATH; ?>/mod/auto_attendant/v_auto_attendant.php'>Auto Attendant</a></td>
-		<td class="vtable">
-			Auto Attendant provides callers the ability to choose between multiple options that direct calls to extensions, 
-			voicemail, conferences, queues, other auto attendants, and external phone numbers.
-		</td>
-	</tr>
-	<tr>
-		<td width='10%' class="vncell" style='text-align: center;'><a href='<?php echo PROJECT_PATH; ?>/core/cdr/v_cdr.php'>Call Detail Records</a></td>
-		<td class="vtable">
-			Call Detail Records (CDRs) are detailed information on the calls. The information contains source, 
-			destination, duration, and other useful call details. Use the fields to filter the information for
-			the specific call records that are desired. Then view the calls in the list or download them as comma
-			seperated file by using the 'csv' button.
-		</td>
-	</tr>
-	<tr>
-		<td width='10%' class="vncell" style='text-align: center;'><a href='<?php echo PROJECT_PATH; ?>/mod/xml_edit/' target='_blank'>XML Editor</a></td>
-		<td class="vtable">
-			Configuration editor enables advanced configuration changes.
-		</td>
-	</tr>
-	<tr>
-		<td width='10%' class="vncell" style='text-align: center;'>Direct Inward System Access</td>
-		<td class="vtable">
-			Direct Inward System Access (DISA) allows inbound callers to make internal or external calls. For security reasons 
-			it is disabled by default. To enable it first set a secure pin number from the Settings->Admin PIN Number.
-			Then go to Dialplan tab and find the DISA entry and edit it to set 'Enabled' to 'true'. 
-			To use DISA dial *3472 (disa) enter the admin pin code and the extension or phone number you wish to call.
-		</td>
-	</tr>
-	<?php
-	if ($v_fax_show) {
-	?>
-	<tr>
-		<td width='10%' class="vncell" style='text-align: center;'><a href='<?php echo PROJECT_PATH; ?>/mod/fax/v_fax.php'>FAX</a></td>
-		<td class="vtable">
-			Transmit and View Received Faxes.
-		</td>
-	</tr>
-	<?php
-	}
-	?>	<tr>
-		<td width='10%' class="vncell" style='text-align: center;'><a href='<?php echo PROJECT_PATH; ?>/mod/hunt_group/v_hunt_group.php'>Hunt Group</a></td>
-		<td class="vtable">
-			Hunt Group is a group of destinations to call at once or in succession.
-		</td>
-	</tr>
-
-	<tr>
-		<td width='10%' class="vncell" style='text-align: center;'><a href='<?php echo PROJECT_PATH; ?>/core/modules/v_modules.php'>Modules</a></td>
-		<td class="vtable">
-			Modules add additional features and can be enabled or disabled to provide the desired features.
-		</td>
-	 </tr>
-
-	 <tr>
-		<td width='10%' class="vncell" style='text-align: center;'><a href='<?php echo PROJECT_PATH; ?>/mod/recordings/v_recordings.php'>Music on Hold</a></td>
-		<td class="vtable">
-			Music on hold can be in WAV or MP3 format. To play an MP3 files you must have mod_shout enabled on the 'Modules' tab. 
-			For best performance upload 16bit 8khz/16khz Mono WAV files.
-		</td>
-	</tr>
-
-	<tr>
-		<td width='10%' class="vncell" style='text-align: center;'><a href='<?php echo PROJECT_PATH; ?>/mod/recordings/v_recordings.php'>Recordings</a></td>
-		<td class="vtable">
-			To make a recording dial *732673 (record) or you can make a 16bit 8khz/16khz
-			Mono WAV file then copy it to the following directory then refresh the page to play
-			it back. Click on the 'Filename' to download it or the 'Recording Name' to play the audio.
-		</td>
-	</tr>
-
-	<tr>
-		<td width='10%' class="vncell" style='text-align: center;'><a href='<?php echo PROJECT_PATH; ?>/mod/voicemail_status/v_voicemail.php'>Voicemail Status</a></td>
-		<td class="vtable">
-			Provides a list of all voicemail boxes with the total number of voicemails for each box.
-			Each voicemail box has a button to 'restore default preferences' this removes the greetings
-			and sets the voicemail greetings back to default.
-		</td>
-	</tr>
-	</table>
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-
-</td>
-</tr>
-</table>
-
-</div>
-
-
-<?php
-
-require_once "resources/footer.php";
-
-?>
-</body>
-</html>

+ 0 - 0
fifo_agents/app_menu.php


+ 1 - 0
get_call_details/app_config.php

@@ -1,4 +1,5 @@
 <?php
+
 	//application details
 		$apps[$x]['name'] = "Get Call Details";
 		$apps[$x]['uuid'] = 'a1200636-cc9e-4636-852c-3ac4ad1bbaa6';

+ 0 - 0
get_call_details/app_menu.php


+ 5 - 21
hunt_groups/app_config.php

@@ -1,4 +1,5 @@
 <?php
+
 	//application details
 		$apps[$x]['name'] = "Hunt Group";
 		$apps[$x]['uuid'] = '0610f841-2e27-4c5f-7926-08ab3aad02e0';
@@ -18,37 +19,19 @@
 		$apps[$x]['description']['pt-pt'] = 'Um grupo de busca é uma lista de destinos que podem ser chamados em sequência ou simultaneamente.';
 		$apps[$x]['description']['pt-br'] = '';
 
-	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Hunt Groups';
-		$apps[$x]['menu'][0]['title']['es-mx'] = 'Grupos de Caza';
-		$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'] = 'Group chasse';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Grupo de Busca';
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = '632f87de-7f86-b68f-c629-4c2d2b3ce545';
-		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/hunt_groups/hunt_groups.php';
-		$apps[$x]['menu'][0]['groups'][] = 'admin';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'hunt_group_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
-		
+
 		$apps[$x]['permissions'][1]['name'] = 'hunt_group_add';
 		$apps[$x]['permissions'][1]['groups'][] = 'admin';
 		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
-	
+
 		$apps[$x]['permissions'][2]['name'] = 'hunt_group_edit';
 		$apps[$x]['permissions'][2]['groups'][] = 'admin';
 		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
-	
+
 		$apps[$x]['permissions'][3]['name'] = 'hunt_group_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'admin';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
@@ -278,4 +261,5 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_users';
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'user_uuid';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+
 ?>

+ 20 - 0
hunt_groups/app_menu.php

@@ -0,0 +1,20 @@
+<?php
+
+	$apps[$x]['menu'][0]['title']['en-us'] = 'Hunt Groups';
+	$apps[$x]['menu'][0]['title']['es-mx'] = 'Grupos de Caza';
+	$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'] = 'Group chasse';
+	$apps[$x]['menu'][0]['title']['fr-ca'] = '';
+	$apps[$x]['menu'][0]['title']['fr-ch'] = '';
+	$apps[$x]['menu'][0]['title']['pt-pt'] = 'Grupo de Busca';
+	$apps[$x]['menu'][0]['title']['pt-br'] = '';
+	$apps[$x]['menu'][0]['uuid'] = '632f87de-7f86-b68f-c629-4c2d2b3ce545';
+	$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
+	$apps[$x]['menu'][0]['category'] = 'internal';
+	$apps[$x]['menu'][0]['path'] = '/app/hunt_groups/hunt_groups.php';
+	$apps[$x]['menu'][0]['groups'][] = 'admin';
+	$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+
+?>

+ 0 - 20
invoices/app_config.php

@@ -18,26 +18,6 @@
 		$apps[$x]['description']['pt-pt'] = '';
 		$apps[$x]['description']['pt-br'] = '';
 
-	//menu details
-		$y = 0;
-		$apps[$x]['menu'][$y]['title']['en-us'] = 'Invoices';
-		$apps[$x]['menu'][$y]['title']['es-mx'] = '';
-		$apps[$x]['menu'][$y]['title']['de-de'] = '';
-		$apps[$x]['menu'][$y]['title']['de-ch'] = '';
-		$apps[$x]['menu'][$y]['title']['de-at'] = '';
-		$apps[$x]['menu'][$y]['title']['fr-fr'] = '';
-		$apps[$x]['menu'][$y]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][$y]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][$y]['title']['pt-pt'] = '';
-		$apps[$x]['menu'][$y]['title']['pt-br'] = '';
-		$apps[$x]['menu'][$y]['uuid'] = '6ebe753b-0f83-dc34-1c0b-51df2c6f0c3b';
-		$apps[$x]['menu'][$y]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
-		$apps[$x]['menu'][$y]['category'] = 'internal';
-		$apps[$x]['menu'][$y]['path'] = '/app/invoices/invoices.php';
-		//$apps[$x]['menu'][$y]['groups'][] = 'user';
-		//$apps[$x]['menu'][$y]['groups'][] = 'admin';
-		$apps[$x]['menu'][$y]['groups'][] = 'superadmin';
-
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'invoice_view';

+ 22 - 0
invoices/app_menu.php

@@ -0,0 +1,22 @@
+<?php
+
+	$y = 0;
+	$apps[$x]['menu'][$y]['title']['en-us'] = 'Invoices';
+	$apps[$x]['menu'][$y]['title']['es-mx'] = '';
+	$apps[$x]['menu'][$y]['title']['de-de'] = '';
+	$apps[$x]['menu'][$y]['title']['de-ch'] = '';
+	$apps[$x]['menu'][$y]['title']['de-at'] = '';
+	$apps[$x]['menu'][$y]['title']['fr-fr'] = '';
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = '';
+	$apps[$x]['menu'][$y]['title']['fr-ch'] = '';
+	$apps[$x]['menu'][$y]['title']['pt-pt'] = '';
+	$apps[$x]['menu'][$y]['title']['pt-br'] = '';
+	$apps[$x]['menu'][$y]['uuid'] = '6ebe753b-0f83-dc34-1c0b-51df2c6f0c3b';
+	$apps[$x]['menu'][$y]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
+	$apps[$x]['menu'][$y]['category'] = 'internal';
+	$apps[$x]['menu'][$y]['path'] = '/app/invoices/invoices.php';
+	//$apps[$x]['menu'][$y]['groups'][] = 'user';
+	//$apps[$x]['menu'][$y]['groups'][] = 'admin';
+	$apps[$x]['menu'][$y]['groups'][] = 'superadmin';
+
+?>

+ 0 - 17
php_service/app_config.php

@@ -18,23 +18,6 @@
 		$apps[$x]['description']['pt-pt'] = 'Gerir múltiplos serviços dinâmicos e personalizável. Há muitos usos possíveis, incluindo alertas, controle de acesso ssh, comandos de programação para executar, e muitos usos outros que estão ainda a ser descoberto.';
 		$apps[$x]['description']['pt-br'] = '';
 
-	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'PHP Service';
-		$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'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Serviço PHP';
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = 'a8196e2f-5f60-e723-aa3e-83ed76b2ef09';
-		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/php_service/v_php_service.php';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'php_service_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';

+ 19 - 0
php_service/app_menu.php

@@ -0,0 +1,19 @@
+<?php
+
+	$apps[$x]['menu'][0]['title']['en-us'] = 'PHP Service';
+	$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'] = '';
+	$apps[$x]['menu'][0]['title']['fr-ca'] = '';
+	$apps[$x]['menu'][0]['title']['fr-ch'] = '';
+	$apps[$x]['menu'][0]['title']['pt-pt'] = 'Serviço PHP';
+	$apps[$x]['menu'][0]['title']['pt-br'] = '';
+	$apps[$x]['menu'][0]['uuid'] = 'a8196e2f-5f60-e723-aa3e-83ed76b2ef09';
+	$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
+	$apps[$x]['menu'][0]['category'] = 'internal';
+	$apps[$x]['menu'][0]['path'] = '/app/php_service/v_php_service.php';
+	$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+
+?>

+ 2 - 8
profiles/app_config.php

@@ -1,4 +1,5 @@
 <?php
+
 	//application details
 		$apps[$x]['name'] = "SIP Profiles";
 		$apps[$x]['uuid'] = '5414b2d9-fd7c-f4fa-3c31-eecc387bd1e4';
@@ -9,14 +10,6 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en'] = 'Use this to configure your SIP profiles.';
 
-	//menu details
-		$apps[$x]['menu'][0]['title']['en'] = 'SIP Profiles';
-		$apps[$x]['menu'][0]['uuid'] = '3fe562d4-b9d2-74d2-7def-bff4707831e2';
-		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/profiles/v_profiles.php';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'sip_profiles_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
@@ -29,4 +22,5 @@
 
 		$apps[$x]['permissions'][3]['name'] = 'sip_profile_delete';
 		$apps[$x]['permissions'][3]['groups'][] = 'superadmin';
+
 ?>

+ 10 - 0
profiles/app_menu.php

@@ -0,0 +1,10 @@
+<?php
+
+	$apps[$x]['menu'][0]['title']['en'] = 'SIP Profiles';
+	$apps[$x]['menu'][0]['uuid'] = '3fe562d4-b9d2-74d2-7def-bff4707831e2';
+	$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
+	$apps[$x]['menu'][0]['category'] = 'internal';
+	$apps[$x]['menu'][0]['path'] = '/app/profiles/v_profiles.php';
+	$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+
+?>

+ 2 - 10
servers/app_config.php

@@ -1,5 +1,5 @@
 <?php
-/*
+
 	//application details
 		$apps[$x]['name'] = 'Servers';
 		$apps[$x]['guid'] = '0f390134-071e-83d7-a79a-ebb7ae139d71';
@@ -10,14 +10,6 @@
 		$apps[$x]['url'] = 'http://www.fusionpbx.com';
 		$apps[$x]['description']['en-us'] = '';
 
-	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Servers';
-		$apps[$x]['menu'][0]['uuid'] = 'f35ee905-1f30-7529-7420-35fc77e47882';
-		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/core/servers/servers.php';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = 'server_view';
@@ -94,5 +86,5 @@
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'server_setting_description';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-*/
+
 ?>

+ 0 - 0
servers/app_menu.php


+ 2 - 17
signup/app_config.php

@@ -1,4 +1,5 @@
 <?php
+
 	//application details
 		$apps[$x]['name'] = "Sign Up";
 		$apps[$x]['uuid'] = 'd308e9c6-d907-5ba7-b3be-6d3e09cf01aa';
@@ -18,23 +19,7 @@
 		$apps[$x]['description']['pt-pt'] = 'Permite aos clientes na internet para para criar uma conta de utilizador.';
 		$apps[$x]['description']['pt-br'] = '';
 
-	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Sign Up';
-		$apps[$x]['menu'][0]['title']['es-mx'] = 'Inscribirse';
-		$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'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Iniciar';
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = 'a8f49f02-9bfb-65ff-4cd3-85dc3354e4c1';
-		$apps[$x]['menu'][0]['parent_uuid'] = '';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/users/usersupdate.php';
-		$apps[$x]['menu'][0]['groups'][] = 'disabled';
-
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'signup';
+
 ?>

+ 19 - 0
signup/app_menu.php

@@ -0,0 +1,19 @@
+<?php
+
+	$apps[$x]['menu'][0]['title']['en-us'] = 'Sign Up';
+	$apps[$x]['menu'][0]['title']['es-mx'] = 'Inscribirse';
+	$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'] = '';
+	$apps[$x]['menu'][0]['title']['fr-ca'] = '';
+	$apps[$x]['menu'][0]['title']['fr-ch'] = '';
+	$apps[$x]['menu'][0]['title']['pt-pt'] = 'Iniciar';
+	$apps[$x]['menu'][0]['title']['pt-br'] = '';
+	$apps[$x]['menu'][0]['uuid'] = 'a8f49f02-9bfb-65ff-4cd3-85dc3354e4c1';
+	$apps[$x]['menu'][0]['parent_uuid'] = '';
+	$apps[$x]['menu'][0]['category'] = 'internal';
+	$apps[$x]['menu'][0]['path'] = '/app/users/usersupdate.php';
+	$apps[$x]['menu'][0]['groups'][] = 'disabled';
+
+?>

+ 0 - 0
sipml5/app_menu.php


+ 0 - 0
soft_phone/app_menu.php


+ 38 - 0
tickets/app_menu.php

@@ -0,0 +1,38 @@
+<?php
+
+	$apps[$x]['menu'][0]['title']['en'] = 'Ticket Tracker';
+	$apps[$x]['menu'][0]['uuid'] = '77048e9f-b946-ad35-5d6b-7838dd9ea81e';
+	$apps[$x]['menu'][0]['parent_uuid'] = '';
+	$apps[$x]['menu'][0]['category'] = 'internal';
+	$apps[$x]['menu'][0]['path'] = '/app/tickets/v_tickets.php';
+	//$apps[$x]['menu'][0]['groups'][] = 'user';
+	//$apps[$x]['menu'][0]['groups'][] = 'admin';
+	//$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+
+	$apps[$x]['menu'][1]['title']['en'] = 'My Tickets';
+	$apps[$x]['menu'][1]['uuid'] = '5bfa588d-5880-5a9d-206e-c876403d9161';
+	$apps[$x]['menu'][1]['parent_uuid'] = '77048e9f-b946-ad35-5d6b-7838dd9ea81e';
+	$apps[$x]['menu'][1]['category'] = 'internal';
+	$apps[$x]['menu'][1]['path'] = '/app/tickets/v_tickets.php';
+	$apps[$x]['menu'][1]['groups'][] = 'user';
+	$apps[$x]['menu'][1]['groups'][] = 'admin';
+	$apps[$x]['menu'][1]['groups'][] = 'superadmin';
+
+	$apps[$x]['menu'][2]['title']['en'] = 'Create Ticket';
+	$apps[$x]['menu'][2]['uuid'] = '87a8f1e7-cf47-29db-8a5f-46318e119d67';
+	$apps[$x]['menu'][2]['parent_uuid'] = '77048e9f-b946-ad35-5d6b-7838dd9ea81e';
+	$apps[$x]['menu'][2]['category'] = 'internal';
+	$apps[$x]['menu'][2]['path'] = '/app/tickets/v_ticket_create.php';
+	$apps[$x]['menu'][2]['groups'][] = 'user';
+	$apps[$x]['menu'][2]['groups'][] = 'admin';
+	$apps[$x]['menu'][2]['groups'][] = 'superadmin';
+
+	$apps[$x]['menu'][3]['title']['en'] = 'Ticket System Manager';
+	$apps[$x]['menu'][3]['uuid'] = 'a4f3b307-bd62-1d04-e3ad-43da091fa2f8';
+	$apps[$x]['menu'][3]['parent_uuid'] = '77048e9f-b946-ad35-5d6b-7838dd9ea81e';
+	$apps[$x]['menu'][3]['category'] = 'internal';
+	$apps[$x]['menu'][3]['path'] = '/app/tickets/v_manager.php';
+	$apps[$x]['menu'][3]['groups'][] = 'admin';
+	$apps[$x]['menu'][3]['groups'][] = 'superadmin';
+
+?>

+ 0 - 50
user_contacts/root.php

@@ -1,50 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <[email protected]>
-*/
-
-// make sure the PATH_SEPARATOR is defined
-	if (!defined("PATH_SEPARATOR")) {
-		if ( strpos( $_ENV[ "OS" ], "Win" ) !== false ) { define("PATH_SEPARATOR", ";"); } else { define("PATH_SEPARATOR", ":"); }
-	}
-
-// make sure the document_root is set
-	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", "/", $_SERVER["SCRIPT_FILENAME"]);
-	$_SERVER["DOCUMENT_ROOT"] = str_replace($_SERVER["PHP_SELF"], "", $_SERVER["SCRIPT_FILENAME"]);
-	$_SERVER["DOCUMENT_ROOT"] = realpath($_SERVER["DOCUMENT_ROOT"]);
-	//echo "DOCUMENT_ROOT: ".$_SERVER["DOCUMENT_ROOT"]."<br />\n";
-	//echo "PHP_SELF: ".$_SERVER["PHP_SELF"]."<br />\n";
-	//echo "SCRIPT_FILENAME: ".$_SERVER["SCRIPT_FILENAME"]."<br />\n";
-
-// if the project directory exists then add it to the include path otherwise add the document root to the include path
-	if (is_dir($_SERVER["DOCUMENT_ROOT"].'/fusionpbx')){
-		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', '/fusionpbx'); }
-		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER["DOCUMENT_ROOT"].'/fusionpbx' );
-	}
-	else {
-		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', ''); }
-		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] );
-	}
-
-?>

+ 0 - 164
user_contacts/users.php

@@ -1,164 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <[email protected]>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('contact_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-require_once "resources/header.php";
-require_once "resources/paging.php";
-
-//get the http values and set them as php variables
-	$order_by = $_GET["order_by"];
-	$order = $_GET["order"];
-
-//show the content
-	echo "<div align='center'>";
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
-
-	echo "<tr class='border'>\n";
-	echo "	<td align=\"center\">\n";
-	echo "		<br>";
-
-	echo "<table width='100%' border='0'><tr>\n";
-	echo "<td width='50%' nowrap='nowrap' align='left'><b>Contact List</b></td>\n";
-	echo "<td width='50%' align='right'>&nbsp;</td>\n";
-	echo "</tr></table>\n";
-
-	$sql = "";
-	$sql .= "select * from v_users ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	$num_rows = count($result);
-	unset ($prep_statement, $result, $sql);
-
-	$rows_per_page = 150;
-	$param = "";
-	$page = $_GET['page'];
-	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } 
-	list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page); 
-	$offset = $rows_per_page * $page; 
-
-	$sql = "";
-	$sql .= "select * from v_users ";
-	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "limit $rows_per_page offset $offset ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	$result_count = count($result);
-	unset ($prep_statement, $sql);
-
-	$c = 0;
-	$row_style["0"] = "row_style0";
-	$row_style["1"] = "row_style1";
-
-	echo "<div align='center'>\n";
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	echo "<tr>\n";
-	echo th_order_by('username', 'Username', $order_by, $order);
-	echo th_order_by('user_type', 'Type', $order_by, $order);
-	echo th_order_by('user_category', 'Category', $order_by, $order);
-	echo th_order_by('user_first_name', 'First Name', $order_by, $order);
-	echo th_order_by('user_last_name', 'Last Name', $order_by, $order);
-	echo th_order_by('user_company_name', 'Organization', $order_by, $order);
-	echo th_order_by('user_phone_1', 'Phone', $order_by, $order);
-	echo "<td align='right' width='42'>\n";
-	if (permission_exists('contact_add')) {
-		echo "	<a href='user_edit.php' alt='add'>$v_link_label_add</a>\n";
-	}
-	echo "</td>\n";
-	echo "<tr>\n";
-
-	if ($result_count > 0) {
-		foreach($result as $row) {
-			echo "<tr >\n";
-			if (strlen($row[username]) == 0) {
-				echo "	<td valign='top' class='".$row_style[$c]."'>contact&nbsp;</td>\n";
-			}
-			else {
-				echo "	<td valign='top' class='".$row_style[$c]."'>".$row['username']."&nbsp;</td>\n";
-			}
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['user_type']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['user_category']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['user_first_name']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['user_last_name']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['user_company_name']."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['user_phone_1']."&nbsp;</td>\n";
-			echo "	<td valign='top' align='right'>\n";
-			if (permission_exists('contact_edit')) {
-				echo "		<a href='user_edit.php?id=".$row['user_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
-			}
-			if (permission_exists('contact_delete')) {
-				echo "		<a href='user_delete.php?id=".$row['user_uuid']."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
-			}
-			echo "	</td>\n";
-			echo "</tr>\n";
-			if ($c==0) { $c=1; } else { $c=0; }
-		} //end foreach
-		unset($sql, $result);
-	} //end if results
-
-	echo "<tr>\n";
-	echo "<td colspan='8' align='left'>\n";
-	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
-	echo "	<tr>\n";
-	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
-	echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
-	echo "		<td width='33.3%' align='right'>\n";
-	if (permission_exists('contact_add')) {
-		echo "			<a href='user_edit.php' alt='add'>$v_link_label_add</a>\n";
-	}
-	echo "		</td>\n";
-	echo "	</tr>\n";
- 	echo "	</table>\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
-	echo "<br><br>";
-
-	echo "</td>";
-	echo "</tr>";
-	echo "</table>";
-	echo "</div>";
-	echo "<br><br>";
-
-//show the footer
-	require_once "resources/footer.php";
-?>

+ 0 - 63
user_contacts/users_delete.php

@@ -1,63 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <[email protected]>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('contact_delete')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//get the id
-	if (count($_GET)>0) {
-		$id = $_GET["id"];
-	}
-
-//delete the user
-	if (strlen($id)>0) {
-		$sql = "";
-		$sql .= "delete from v_users ";
-		$sql .= "where domain_uuid = '$domain_uuid' ";
-		$sql .= "and id = '$id' ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		unset($sql);
-	}
-
-//redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=users.php\">\n";
-	echo "<div align='center'>\n";
-	echo "Delete Complete\n";
-	echo "</div>\n";
-
-//show the footer
-	require_once "resources/footer.php";
-	return;
-?>

+ 0 - 1031
user_contacts/users_edit.php

@@ -1,1031 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <[email protected]>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('contact_add') || permission_exists('contact_edit')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-//set the action to an add or update
-	if (isset($_REQUEST["id"])) {
-		$action = "update";
-		$user_uuid = check_str($_REQUEST["id"]);
-	}
-	else {
-		$action = "add";
-	}
-
-//get the http post values and set them as php variables
-	if (count($_POST)>0) {
-		$username = check_str($_POST["username"]);
-		$password = check_str($_POST["password"]);
-		$user_type = check_str($_POST["user_type"]);
-		$user_category = check_str($_POST["user_category"]);
-		$user_first_name = check_str($_POST["user_first_name"]);
-		$user_last_name = check_str($_POST["user_last_name"]);
-		$user_company_name = check_str($_POST["user_company_name"]);
-		$user_physical_address_1 = check_str($_POST["user_physical_address_1"]);
-		$user_physical_address_2 = check_str($_POST["user_physical_address_2"]);
-		$user_physical_city = check_str($_POST["user_physical_city"]);
-		$user_physical_state_province = check_str($_POST["user_physical_state_province"]);
-		$user_physical_postal_code = check_str($_POST["user_physical_postal_code"]);
-		$user_physical_country = check_str($_POST["user_physical_country"]);
-		$user_mailing_address_1 = check_str($_POST["user_mailing_address_1"]);
-		$user_mailing_address_2 = check_str($_POST["user_mailing_address_2"]);
-		$user_mailing_city = check_str($_POST["user_mailing_city"]);
-		$user_mailing_state_province = check_str($_POST["user_mailing_state_province"]);
-		$user_mailing_postal_code = check_str($_POST["user_mailing_postal_code"]);
-		$user_mailing_country = check_str($_POST["user_mailing_country"]);
-		$user_billing_address_1 = check_str($_POST["user_billing_address_1"]);
-		$user_billing_address_2 = check_str($_POST["user_billing_address_2"]);
-		$user_billing_city = check_str($_POST["user_billing_city"]);
-		$user_billing_state_province = check_str($_POST["user_billing_state_province"]);
-		$user_billing_postal_code = check_str($_POST["user_billing_postal_code"]);
-		$user_billing_country = check_str($_POST["user_billing_country"]);
-		$user_shipping_address_1 = check_str($_POST["user_shipping_address_1"]);
-		$user_shipping_address_2 = check_str($_POST["user_shipping_address_2"]);
-		$user_shipping_city = check_str($_POST["user_shipping_city"]);
-		$user_shipping_state_province = check_str($_POST["user_shipping_state_province"]);
-		$user_shipping_postal_code = check_str($_POST["user_shipping_postal_code"]);
-		$user_shipping_country = check_str($_POST["user_shipping_country"]);
-		$user_phone_1 = check_str($_POST["user_phone_1"]);
-		$user_phone_1_ext = check_str($_POST["user_phone_1_ext"]);
-		$user_phone_2 = check_str($_POST["user_phone_2"]);
-		$user_phone_2_ext = check_str($_POST["user_phone_2_ext"]);
-		$user_phone_mobile = check_str($_POST["user_phone_mobile"]);
-		$user_phone_fax = check_str($_POST["user_phone_fax"]);
-		$user_phone_emergency_mobile = check_str($_POST["user_phone_emergency_mobile"]);
-		$user_email_emergency = check_str($_POST["user_email_emergency"]);
-		$user_email = check_str($_POST["user_email"]);
-		$user_url = check_str($_POST["user_url"]);
-		$user_notes = check_str($_POST["user_notes"]);
-		$user_optional_1 = check_str($_POST["user_optional_1"]);
-		$user_add_user = check_str($_POST["user_add_user"]);
-		$user_add_date = check_str($_POST["user_add_date"]);
-	}
-
-if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
-
-	$msg = '';
-	if ($action == "update") {
-		$id = check_str($_POST["id"]);
-	}
-
-	//check for all required data
-		//if (strlen($username) == 0) { $msg .= "Please provide: Username<br>\n"; }
-		//if (strlen($password) == 0) { $msg .= "Please provide: Password<br>\n"; }
-		//if (strlen($user_type) == 0) { $msg .= "Please provide: Type<br>\n"; }
-		//if (strlen($user_category) == 0) { $msg .= "Please provide: Category<br>\n"; }
-		//if (strlen($user_first_name) == 0) { $msg .= "Please provide: First Name<br>\n"; }
-		//if (strlen($user_last_name) == 0) { $msg .= "Please provide: Last Name<br>\n"; }
-		//if (strlen($user_company_name) == 0) { $msg .= "Please provide: Organization<br>\n"; }
-		//if (strlen($user_physical_address_1) == 0) { $msg .= "Please provide: Address 1<br>\n"; }
-		//if (strlen($user_physical_address_2) == 0) { $msg .= "Please provide: Address 2<br>\n"; }
-		//if (strlen($user_physical_city) == 0) { $msg .= "Please provide: City<br>\n"; }
-		//if (strlen($user_physical_state_province) == 0) { $msg .= "Please provide: State/Province<br>\n"; }
-		//if (strlen($user_physical_postal_code) == 0) { $msg .= "Please provide: Postal Code<br>\n"; }
-		//if (strlen($user_physical_country) == 0) { $msg .= "Please provide: Country<br>\n"; }
-		//if (strlen($user_mailing_address_1) == 0) { $msg .= "Please provide: Address 1<br>\n"; }
-		//if (strlen($user_mailing_address_2) == 0) { $msg .= "Please provide: Address 2<br>\n"; }
-		//if (strlen($user_mailing_city) == 0) { $msg .= "Please provide: City<br>\n"; }
-		//if (strlen($user_mailing_state_province) == 0) { $msg .= "Please provide: State/Province<br>\n"; }
-		//if (strlen($user_mailing_postal_code) == 0) { $msg .= "Please provide: Postal Code<br>\n"; }
-		//if (strlen($user_mailing_country) == 0) { $msg .= "Please provide: Country<br>\n"; }
-		//if (strlen($user_billing_address_1) == 0) { $msg .= "Please provide: Address 1<br>\n"; }
-		//if (strlen($user_billing_address_2) == 0) { $msg .= "Please provide: Address 2<br>\n"; }
-		//if (strlen($user_billing_city) == 0) { $msg .= "Please provide: City<br>\n"; }
-		//if (strlen($user_billing_state_province) == 0) { $msg .= "Please provide: State/Province<br>\n"; }
-		//if (strlen($user_billing_postal_code) == 0) { $msg .= "Please provide: Postal Code<br>\n"; }
-		//if (strlen($user_billing_country) == 0) { $msg .= "Please provide: Country<br>\n"; }
-		//if (strlen($user_shipping_address_1) == 0) { $msg .= "Please provide: Address 1<br>\n"; }
-		//if (strlen($user_shipping_address_2) == 0) { $msg .= "Please provide: Address 2<br>\n"; }
-		//if (strlen($user_shipping_city) == 0) { $msg .= "Please provide: City<br>\n"; }
-		//if (strlen($user_shipping_state_province) == 0) { $msg .= "Please provide: State/Province<br>\n"; }
-		//if (strlen($user_shipping_postal_code) == 0) { $msg .= "Please provide: Postal Code<br>\n"; }
-		//if (strlen($user_shipping_country) == 0) { $msg .= "Please provide: Country<br>\n"; }
-		//if (strlen($user_phone_1) == 0) { $msg .= "Please provide: Phone 1<br>\n"; }
-		//if (strlen($user_phone_1_ext) == 0) { $msg .= "Please provide: Ext 1<br>\n"; }
-		//if (strlen($user_phone_2) == 0) { $msg .= "Please provide: Phone 2<br>\n"; }
-		//if (strlen($user_phone_2_ext) == 0) { $msg .= "Please provide: Ext 2<br>\n"; }
-		//if (strlen($user_phone_mobile) == 0) { $msg .= "Please provide: Mobile<br>\n"; }
-		//if (strlen($user_phone_fax) == 0) { $msg .= "Please provide: FAX<br>\n"; }
-		//if (strlen($user_phone_emergency_mobile) == 0) { $msg .= "Please provide: Emergency Mobile<br>\n"; }
-		//if (strlen($user_email_emergency) == 0) { $msg .= "Please provide: Emergency Email<br>\n"; }
-		//if (strlen($user_email) == 0) { $msg .= "Please provide: Email<br>\n"; }
-		//if (strlen($user_url) == 0) { $msg .= "Please provide: URL<br>\n"; }
-		//if (strlen($user_notes) == 0) { $msg .= "Please provide: Notes<br>\n"; }
-		//if (strlen($user_optional_1) == 0) { $msg .= "Please provide: Optional 1<br>\n"; }
-		//if (strlen($user_add_user) == 0) { $msg .= "Please provide: Add User<br>\n"; }
-		//if (strlen($user_add_date) == 0) { $msg .= "Please provide: Add Date<br>\n"; }
-		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
-			require_once "resources/header.php";
-			require_once "resources/persist_form_var.php";
-			echo "<div align='center'>\n";
-			echo "<table><tr><td>\n";
-			echo $msg."<br />";
-			echo "</td></tr></table>\n";
-			persistformvar($_POST);
-			echo "</div>\n";
-			require_once "resources/footer.php";
-			return;
-		}
-
-		//add or update the database
-			if ($_POST["persistformvar"] != "true") {
-				if ($action == "add" && permission_exists('contact_add')) {
-					$sql = "insert into v_users ";
-					$sql .= "(";
-					$sql .= "domain_uuid, ";
-					$sql .= "user_uuid, ";
-					//$sql .= "username, ";
-					//$sql .= "password, ";
-					$sql .= "user_type, ";
-					$sql .= "user_category, ";
-					$sql .= "user_first_name, ";
-					$sql .= "user_last_name, ";
-					$sql .= "user_company_name, ";
-					$sql .= "user_physical_address_1, ";
-					$sql .= "user_physical_address_2, ";
-					$sql .= "user_physical_city, ";
-					$sql .= "user_physical_state_province, ";
-					$sql .= "user_physical_postal_code, ";
-					$sql .= "user_physical_country, ";
-					$sql .= "user_mailing_address_1, ";
-					$sql .= "user_mailing_address_2, ";
-					$sql .= "user_mailing_city, ";
-					$sql .= "user_mailing_state_province, ";
-					$sql .= "user_mailing_postal_code, ";
-					$sql .= "user_mailing_country, ";
-					$sql .= "user_billing_address_1, ";
-					$sql .= "user_billing_address_2, ";
-					$sql .= "user_billing_city, ";
-					$sql .= "user_billing_state_province, ";
-					$sql .= "user_billing_postal_code, ";
-					$sql .= "user_billing_country, ";
-					$sql .= "user_shipping_address_1, ";
-					$sql .= "user_shipping_address_2, ";
-					$sql .= "user_shipping_city, ";
-					$sql .= "user_shipping_state_province, ";
-					$sql .= "user_shipping_postal_code, ";
-					$sql .= "user_shipping_country, ";
-					$sql .= "user_phone_1, ";
-					$sql .= "user_phone_1_ext, ";
-					$sql .= "user_phone_2, ";
-					$sql .= "user_phone_2_ext, ";
-					$sql .= "user_phone_mobile, ";
-					$sql .= "user_phone_fax, ";
-					$sql .= "user_phone_emergency_mobile, ";
-					$sql .= "user_email_emergency, ";
-					$sql .= "user_email, ";
-					$sql .= "user_url, ";
-					$sql .= "user_notes, ";
-					$sql .= "user_optional_1, ";
-					$sql .= "user_add_user, ";
-					$sql .= "user_add_date ";
-					$sql .= ")";
-					$sql .= "values ";
-					$sql .= "(";
-					$sql .= "'$domain_uuid', ";
-					$sql .= "'".uuid()."', ";
-					//$sql .= "'$username', ";
-					//$sql .= "'$password', ";
-					$sql .= "'$user_type', ";
-					$sql .= "'$user_category', ";
-					$sql .= "'$user_first_name', ";
-					$sql .= "'$user_last_name', ";
-					$sql .= "'$user_company_name', ";
-					$sql .= "'$user_physical_address_1', ";
-					$sql .= "'$user_physical_address_2', ";
-					$sql .= "'$user_physical_city', ";
-					$sql .= "'$user_physical_state_province', ";
-					$sql .= "'$user_physical_postal_code', ";
-					$sql .= "'$user_physical_country', ";
-					$sql .= "'$user_mailing_address_1', ";
-					$sql .= "'$user_mailing_address_2', ";
-					$sql .= "'$user_mailing_city', ";
-					$sql .= "'$user_mailing_state_province', ";
-					$sql .= "'$user_mailing_postal_code', ";
-					$sql .= "'$user_mailing_country', ";
-					$sql .= "'$user_billing_address_1', ";
-					$sql .= "'$user_billing_address_2', ";
-					$sql .= "'$user_billing_city', ";
-					$sql .= "'$user_billing_state_province', ";
-					$sql .= "'$user_billing_postal_code', ";
-					$sql .= "'$user_billing_country', ";
-					$sql .= "'$user_shipping_address_1', ";
-					$sql .= "'$user_shipping_address_2', ";
-					$sql .= "'$user_shipping_city', ";
-					$sql .= "'$user_shipping_state_province', ";
-					$sql .= "'$user_shipping_postal_code', ";
-					$sql .= "'$user_shipping_country', ";
-					$sql .= "'$user_phone_1', ";
-					$sql .= "'$user_phone_1_ext', ";
-					$sql .= "'$user_phone_2', ";
-					$sql .= "'$user_phone_2_ext', ";
-					$sql .= "'$user_phone_mobile', ";
-					$sql .= "'$user_phone_fax', ";
-					$sql .= "'$user_phone_emergency_mobile', ";
-					$sql .= "'$user_email_emergency', ";
-					$sql .= "'$user_email', ";
-					$sql .= "'$user_url', ";
-					$sql .= "'$user_notes', ";
-					$sql .= "'$user_optional_1', ";
-					$sql .= "'$user_add_user', ";
-					$sql .= "'$user_add_date' ";
-					$sql .= ")";
-					$db->exec(check_sql($sql));
-					unset($sql);
-
-					require_once "resources/header.php";
-					echo "<meta http-equiv=\"refresh\" content=\"2;url=users.php\">\n";
-					echo "<div align='center'>\n";
-					echo "Add Complete\n";
-					echo "</div>\n";
-					require_once "resources/footer.php";
-					return;
-				} //if ($action == "add")
-
-				if ($action == "update" || permission_exists('contact_edit')) {
-					$sql = "update v_users set ";
-					//$sql .= "username = '$username', ";
-					//if (strlen($password) > 0) {
-					//	$sql .= "password = '$password', ";
-					//}
-					$sql .= "user_type = '$user_type', ";
-					$sql .= "user_category = '$user_category', ";
-					$sql .= "user_first_name = '$user_first_name', ";
-					$sql .= "user_last_name = '$user_last_name', ";
-					$sql .= "user_company_name = '$user_company_name', ";
-					$sql .= "user_physical_address_1 = '$user_physical_address_1', ";
-					$sql .= "user_physical_address_2 = '$user_physical_address_2', ";
-					$sql .= "user_physical_city = '$user_physical_city', ";
-					$sql .= "user_physical_state_province = '$user_physical_state_province', ";
-					$sql .= "user_physical_postal_code = '$user_physical_postal_code', ";
-					$sql .= "user_physical_country = '$user_physical_country', ";
-					$sql .= "user_mailing_address_1 = '$user_mailing_address_1', ";
-					$sql .= "user_mailing_address_2 = '$user_mailing_address_2', ";
-					$sql .= "user_mailing_city = '$user_mailing_city', ";
-					$sql .= "user_mailing_state_province = '$user_mailing_state_province', ";
-					$sql .= "user_mailing_postal_code = '$user_mailing_postal_code', ";
-					$sql .= "user_mailing_country = '$user_mailing_country', ";
-					$sql .= "user_billing_address_1 = '$user_billing_address_1', ";
-					$sql .= "user_billing_address_2 = '$user_billing_address_2', ";
-					$sql .= "user_billing_city = '$user_billing_city', ";
-					$sql .= "user_billing_state_province = '$user_billing_state_province', ";
-					$sql .= "user_billing_postal_code = '$user_billing_postal_code', ";
-					$sql .= "user_billing_country = '$user_billing_country', ";
-					$sql .= "user_shipping_address_1 = '$user_shipping_address_1', ";
-					$sql .= "user_shipping_address_2 = '$user_shipping_address_2', ";
-					$sql .= "user_shipping_city = '$user_shipping_city', ";
-					$sql .= "user_shipping_state_province = '$user_shipping_state_province', ";
-					$sql .= "user_shipping_postal_code = '$user_shipping_postal_code', ";
-					$sql .= "user_shipping_country = '$user_shipping_country', ";
-					$sql .= "user_phone_1 = '$user_phone_1', ";
-					$sql .= "user_phone_1_ext = '$user_phone_1_ext', ";
-					$sql .= "user_phone_2 = '$user_phone_2', ";
-					$sql .= "user_phone_2_ext = '$user_phone_2_ext', ";
-					$sql .= "user_phone_mobile = '$user_phone_mobile', ";
-					$sql .= "user_phone_fax = '$user_phone_fax', ";
-					$sql .= "user_phone_emergency_mobile = '$user_phone_emergency_mobile', ";
-					$sql .= "user_email_emergency = '$user_email_emergency', ";
-					$sql .= "user_email = '$user_email', ";
-					$sql .= "user_url = '$user_url', ";
-					$sql .= "user_notes = '$user_notes', ";
-					$sql .= "user_optional_1 = '$user_optional_1' ";
-					//$sql .= "user_add_user = '$user_add_user', ";
-					//$sql .= "user_add_date = '$user_add_date' ";
-					$sql .= "where domain_uuid = '$domain_uuid' ";
-					$sql .= "and user_uuid = '$id' ";
-					$db->exec(check_sql($sql));
-					unset($sql);
-
-					require_once "resources/header.php";
-					echo "<meta http-equiv=\"refresh\" content=\"2;url=users.php\">\n";
-					echo "<div align='center'>\n";
-					echo "Update Complete\n";
-					echo "</div>\n";
-					require_once "resources/footer.php";
-					return;
-				} //if ($action == "update")
-		} //if ($_POST["persistformvar"] != "true")
-	} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
-
-	//pre-populate the form
-		if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
-			$id = $_GET["id"];
-			$sql = "";
-			$sql .= "select * from v_users ";
-			$sql .= "where domain_uuid = '$domain_uuid' ";
-			$sql .= "and id = '$id' ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-			foreach ($result as &$row) {
-				//$username = $row["username"];
-				//$password = $row["password"];
-				$user_type = $row["user_type"];
-				$user_category = $row["user_category"];
-				$user_first_name = $row["user_first_name"];
-				$user_last_name = $row["user_last_name"];
-				$user_company_name = $row["user_company_name"];
-				$user_physical_address_1 = $row["user_physical_address_1"];
-				$user_physical_address_2 = $row["user_physical_address_2"];
-				$user_physical_city = $row["user_physical_city"];
-				$user_physical_state_province = $row["user_physical_state_province"];
-				$user_physical_postal_code = $row["user_physical_postal_code"];
-				$user_physical_country = $row["user_physical_country"];
-				$user_mailing_address_1 = $row["user_mailing_address_1"];
-				$user_mailing_address_2 = $row["user_mailing_address_2"];
-				$user_mailing_city = $row["user_mailing_city"];
-				$user_mailing_state_province = $row["user_mailing_state_province"];
-				$user_mailing_postal_code = $row["user_mailing_postal_code"];
-				$user_mailing_country = $row["user_mailing_country"];
-				$user_billing_address_1 = $row["user_billing_address_1"];
-				$user_billing_address_2 = $row["user_billing_address_2"];
-				$user_billing_city = $row["user_billing_city"];
-				$user_billing_state_province = $row["user_billing_state_province"];
-				$user_billing_postal_code = $row["user_billing_postal_code"];
-				$user_billing_country = $row["user_billing_country"];
-				$user_shipping_address_1 = $row["user_shipping_address_1"];
-				$user_shipping_address_2 = $row["user_shipping_address_2"];
-				$user_shipping_city = $row["user_shipping_city"];
-				$user_shipping_state_province = $row["user_shipping_state_province"];
-				$user_shipping_postal_code = $row["user_shipping_postal_code"];
-				$user_shipping_country = $row["user_shipping_country"];
-				$user_phone_1 = $row["user_phone_1"];
-				$user_phone_1_ext = $row["user_phone_1_ext"];
-				$user_phone_2 = $row["user_phone_2"];
-				$user_phone_2_ext = $row["user_phone_2_ext"];
-				$user_phone_mobile = $row["user_phone_mobile"];
-				$user_phone_fax = $row["user_phone_fax"];
-				$user_phone_emergency_mobile = $row["user_phone_emergency_mobile"];
-				$user_email_emergency = $row["user_email_emergency"];
-				$user_email = $row["user_email"];
-				$user_url = $row["user_url"];
-				$user_notes = $row["user_notes"];
-				$user_optional_1 = $row["user_optional_1"];
-				//$user_add_user = $row["user_add_user"];
-				//$user_add_date = $row["user_add_date"];
-				break; //limit to 1 row
-			}
-			unset ($prep_statement);
-		}
-
-	//show the header
-		require_once "resources/header.php";
-
-	//show the content
-			echo "<div align='center'>";
-			echo "<table width='100%' border='0' cellpadding='0' cellspacing=''>\n";
-			echo "<tr class=''>\n";
-			echo "	<td align=\"left\">\n";
-			echo "	  <br>";
-
-			$tablewidth = "width='100%'";
-
-			echo "<form method='post' name='frm' action=''>\n";
-			echo "<table width='100%'  border='0' cellpadding='0' cellspacing='0'>\n";
-			echo "<tr>\n";
-			if ($action == "add") {
-				echo "<td width='30%' nowrap><b>Contact Add</b></td>\n";
-			}
-			if ($action == "update") {
-				echo "<td width='30%' nowrap><b>Contact Edit</b></td>\n";
-			}
-			echo "<td width='70%' align='right'>\n";
-			echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='users_vcard.php?id=$id'\" value='vcard'>\n";
-			echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='users.php'\" value='Back'>\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-			echo "<tr><td colspan='2'>\n";
-			if ($action == "add") {
-				echo "Add the contact information to the fields below.</td>\n";
-			}
-			if ($action == "update") {
-				echo "Edit the contact information using the fields below.\n";
-			}
-			echo "</td>\n";
-			echo "</tr>\n";
-			echo "</table>\n";
-
-			echo "<br />\n";
-
-		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "<tr>\n";
-		echo "<td valign='top'>\n";
-
-			echo "<b>User Info</b><br>";
-			echo "<div align='center' class='' style='padding:10px;'>\n";
-			echo "<table $tablewidth cellpadding='6' cellspacing='0'>";
-
-			//echo "<tr>\n";
-			//echo "<td width='30%' class='vncell' valign='top' align='left' nowrap>\n";
-			//echo "	Username:\n";
-			//echo "</td>\n";
-			//echo "<td width='70%' class='vtable' align='left'>\n";
-			//echo "	<input style='width: 80%;' class='formfld' type='text' name='username' autocomplete='off' maxlength='255' value=\"$username\">\n";
-			//echo "<br />\n";
-			//echo "\n";
-			//echo "</td>\n";
-			//echo "</tr>\n";
-
-			//echo "<tr>\n";
-			//echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			//echo "	Password:\n";
-			//echo "</td>\n";
-			//echo "<td class='vtable' align='left'>\n";
-			//echo "	<input style='width: 80%;' class='formfld' type='password' name='password' autocomplete='off' maxlength='255' value=\"$password\">\n";
-			//echo "<br />\n";
-			//echo "\n";
-			//echo "</td>\n";
-			//echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td  width='30%' class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Type:\n";
-			echo "</td>\n";
-			echo "<td width='70%' class='vtable' align='left'>\n";
-			echo "	<select style='width: 80%;' class='formfld' name='user_type'>\n";
-			echo "	<option value=''></option>\n";
-			if ($user_type == "Individual") {
-				echo "	<option value='Individual' selected>Individual</option>\n";
-			}
-			else {
-				echo "	<option value='Individual'>Individual</option>\n";
-			}
-			if ($user_type == "Organization") {
-				echo "	<option value='Organization' selected>Organization</option>\n";
-			}
-			else {
-				echo "	<option value='Organization'>Organization</option>\n";
-			}
-			echo "	</select>\n";
-
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Category:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_category' maxlength='255' value=\"$user_category\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	First Name:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' style='' type='text' name='user_first_name' maxlength='255' value=\"$user_first_name\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Last Name:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_last_name' maxlength='255' value=\"$user_last_name\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Organization:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_company_name' maxlength='255' value=\"$user_company_name\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-			echo "</table>\n";
-			echo "</div>\n";
-
-
-			echo "<b>Contact Information</b><br>";
-			echo "<div align='center' class='' style='padding:10px;'>\n";
-			echo "<table $tablewidth cellpadding='6' cellspacing='0'>";
-			echo "<tr>\n";
-			echo "<td width='30%' class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Phone 1:\n";
-			echo "</td>\n";
-			echo "<td width='70%' class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_phone_1' maxlength='255' value=\"$user_phone_1\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Ext 1:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_phone_1_ext' maxlength='255' value=\"$user_phone_1_ext\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Phone 2:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_phone_2' maxlength='255' value=\"$user_phone_2\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Ext 2:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_phone_2_ext' maxlength='255' value=\"$user_phone_2_ext\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Mobile:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_phone_mobile' maxlength='255' value=\"$user_phone_mobile\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	FAX:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_phone_fax' maxlength='255' value=\"$user_phone_fax\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Emergency Mobile:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_phone_emergency_mobile' maxlength='255' value=\"$user_phone_emergency_mobile\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Emergency Email:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_email_emergency' maxlength='255' value=\"$user_email_emergency\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-			echo "</table>\n";
-			echo "</div>\n";
-
-			echo "<b>Additional Information</b><br>";
-			echo "<div align='center' class='' style='padding:10px;'>\n";
-			echo "<table $tablewidth cellpadding='6' cellspacing='0'>";
-			echo "<tr>\n";
-			echo "<td width='30%' class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Email:\n";
-			echo "</td>\n";
-			echo "<td width='70%' class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_email' maxlength='255' value=\"$user_email\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	URL:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_url' maxlength='255' value=\"$user_url\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Notes:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<textarea style='width: 80%;' class='formfld' type='text' name='user_notes' rows='5'>$user_notes</textarea> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			//echo "<tr>\n";
-			//echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			//echo "	Optional 1:\n";
-			//echo "</td>\n";
-			//echo "<td class='vtable' align='left'>\n";
-			//echo "	<input style='width: 80%;' class='formfld' type='text' name='user_optional_1' maxlength='255' value=\"$user_optional_1\">\n";
-			//echo "<br />\n";
-			//echo "\n";
-			//echo "</td>\n";
-			//echo "</tr>\n";
-
-			//echo "<tr>\n";
-			//echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			//echo "	Optional 1:\n";
-			//echo "</td>\n";
-			//echo "<td class='vtable' align='left'>\n";
-			//echo "	<input style='width: 80%;' class='formfld' type='text' name='user_optional_2' maxlength='255' value=\"$user_optional_2\">\n";
-			//echo "<br />\n";
-			//echo "\n";
-			//echo "</td>\n";
-			//echo "</tr>\n";
-
-			echo "</table>\n";
-			echo "</div>\n";
-
-		echo "</td>\n";
-		echo "<td valign='top'>\n";
-
-			echo "<b>Physical Address</b><br>";
-			echo "<div align='center' class='' style='padding:10px;'>\n";
-			echo "<table $tablewidth cellpadding='6' cellspacing='0'>";
-			echo "<tr>\n";
-			echo "<td width='30%' class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Address 1:\n";
-			echo "</td>\n";
-			echo "<td width='70%' class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_physical_address_1' maxlength='255' value=\"$user_physical_address_1\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Address 2:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_physical_address_2' maxlength='255' value=\"$user_physical_address_2\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	City:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_physical_city' maxlength='255' value=\"$user_physical_city\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	State/Province:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_physical_state_province' maxlength='255' value=\"$user_physical_state_province\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Postal Code:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_physical_postal_code' maxlength='255' value=\"$user_physical_postal_code\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Country:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_physical_country' maxlength='255' value=\"$user_physical_country\"> <span class='smalltext'>vcard</span>\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-			echo "</table>\n";
-			echo "</div>\n";
-
-			echo "<b>Postal Address</b><br>";
-			echo "<div align='center' class='' style='padding:10px;'>\n";
-			echo "<table $tablewidth cellpadding='6' cellspacing='0'>";
-			echo "<tr>\n";
-			echo "<td width='30%' class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Address 1:\n";
-			echo "</td>\n";
-			echo "<td width='70%' class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_mailing_address_1' maxlength='255' value=\"$user_mailing_address_1\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Address 2:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_mailing_address_2' maxlength='255' value=\"$user_mailing_address_2\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	City:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_mailing_city' maxlength='255' value=\"$user_mailing_city\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	State/Province:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_mailing_state_province' maxlength='255' value=\"$user_mailing_state_province\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Postal Code:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_mailing_postal_code' maxlength='255' value=\"$user_mailing_postal_code\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Country:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_mailing_country' maxlength='255' value=\"$user_mailing_country\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-			echo "</table>\n";
-			echo "</div>\n";
-
-			echo "<b>Billing Address</b><br>";
-			echo "<div align='center' class='' style='padding:10px;'>\n";
-			echo "<table $tablewidth cellpadding='6' cellspacing='0'>";
-			echo "<tr>\n";
-			echo "<td width='30%' class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Address 1:\n";
-			echo "</td>\n";
-			echo "<td width='70%' class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_billing_address_1' maxlength='255' value=\"$user_billing_address_1\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Address 2:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_billing_address_2' maxlength='255' value=\"$user_billing_address_2\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	City:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_billing_city' maxlength='255' value=\"$user_billing_city\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	State/Province:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_billing_state_province' maxlength='255' value=\"$user_billing_state_province\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Postal Code:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_billing_postal_code' maxlength='255' value=\"$user_billing_postal_code\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Country:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_billing_country' maxlength='255' value=\"$user_billing_country\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-			echo "</table>\n";
-			echo "</div>\n";
-
-			echo "<b>Shipping Address</b><br>";
-			echo "<div align='center' class='' style='padding:10px;'>\n";
-			echo "<table $tablewidth cellpadding='6' cellspacing='0'>";
-			echo "<tr>\n";
-			echo "<td width='30%' class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Address 1:\n";
-			echo "</td>\n";
-			echo "<td width='70%' class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_shipping_address_1' maxlength='255' value=\"$user_shipping_address_1\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Address 2:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_shipping_address_2' maxlength='255' value=\"$user_shipping_address_2\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	City:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_shipping_city' maxlength='255' value=\"$user_shipping_city\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	State/Province:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_shipping_state_province' maxlength='255' value=\"$user_shipping_state_province\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Postal Code:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_shipping_postal_code' maxlength='255' value=\"$user_shipping_postal_code\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			echo "	Country:\n";
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<input style='width: 80%;' class='formfld' type='text' name='user_shipping_country' maxlength='255' value=\"$user_shipping_country\">\n";
-			echo "<br />\n";
-			echo "\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-			echo "</table>\n";
-			echo "</div>\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-		echo "</table>\n";
-
-			//echo "<tr>\n";
-			//echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			//echo "	Add User:\n";
-			//echo "</td>\n";
-			//echo "<td class='vtable' align='left'>\n";
-			//echo "	<input style='width: 80%;' class='formfld' type='text' name='user_add_user' maxlength='255' value=\"$user_add_user\">\n";
-			//echo "<br />\n";
-			//echo "\n";
-			//echo "</td>\n";
-			//echo "</tr>\n";
-
-			//echo "<tr>\n";
-			//echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-			//echo "	Add Date:\n";
-			//echo "</td>\n";
-			//echo "<td class='vtable' align='left'>\n";
-			//echo "	<input style='width: 80%;' class='formfld' type='text' name='user_add_date' maxlength='255' value=\"$user_add_date\">\n";
-			//echo "<br />\n";
-			//echo "\n";
-			//echo "</td>\n";
-			//echo "</tr>\n";
-
-			echo "	<tr>\n";
-			echo "		<td colspan='2' align='right'>\n";
-			if ($action == "update") {
-				echo "				<input type='hidden' name='id' value='$user_uuid'>\n";
-			}
-			echo "				<input type='submit' name='submit' class='btn' value='Save'>\n";
-			echo "		</td>\n";
-			echo "	</tr>";
-			echo "</table>";
-			echo "</form>";
-
-			echo "	</td>";
-			echo "	</tr>";
-			echo "</table>";
-			echo "</div>";
-
-			echo "<br />\n";
-			echo "<br />\n";
-
-//show the footer
-	require_once "resources/footer.php";
-?>

+ 0 - 135
user_contacts/users_vcard.php

@@ -1,135 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <[email protected]>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <[email protected]>
-*/
-include "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('contact_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
-
-require_once "resources/classes/vcard.php";
-$vc = new vcard();
-
-if (count($_GET)>0) {
-	$id = $_GET["id"];
-	$sql = "";
-	$sql .= "select * from v_users ";
-	$sql .= "where domain_uuid = '$domain_uuid' ";
-	$sql .= "and id = '$id' ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	foreach ($result as &$row) {
-
-		$vc->data[display_name] = $row["user_first_name"]." ".$row["user_last_name"];
-		//$vc->data[zzz] = $row["user_type"];
-		//$vc->data[zzz] = $row["user_category"];
-		$vc->data[first_name] = $row["user_first_name"];
-		$vc->data[last_name] = $row["user_last_name"];
-		$vc->data[company] = $row["user_company_name"];
-
-		$vc->data[work_address] = $row["user_physical_address_1"];
-		$vc->data[work_extended_address] = $row["user_physical_address_2"];
-		$vc->data[work_city] = $row["user_physical_city"];
-		$vc->data[work_state] = $row["user_physical_state_province"];
-		$vc->data[work_postal_code] = $row["user_physical_postal_code"];
-		$vc->data[work_country] = $row["user_physical_country"];
-
-		$vc->data[home_address] = $row["user_physical_address_1"];
-		$vc->data[home_extended_address] = $row["user_physical_address_2"];
-		$vc->data[home_city] = $row["user_physical_city"];
-		$vc->data[home_state] = $row["user_physical_state_province"];
-		$vc->data[home_postal_code] = $row["user_physical_postal_code"];
-		$vc->data[home_country] = $row["user_physical_country"];
-
-		//$vc->data[zzz] = $row["user_mailing_address_1"];
-		//$vc->data[zzz] = $row["user_mailing_address_2"];
-		//$vc->data[zzz] = $row["user_mailing_city"];
-		//$vc->data[zzz] = $row["user_mailing_state_province"];
-		//$vc->data[zzz] = $row["user_mailing_postal_code"];
-		//$vc->data[zzz] = $row["user_mailing_country"];
-		//$vc->data[zzz] = $row["user_billing_address_1"];
-		//$vc->data[zzz] = $row["user_billing_address_2"];
-		//$vc->data[zzz] = $row["user_billing_city"];
-		//$vc->data[zzz] = $row["user_billing_state_province"];
-		//$vc->data[zzz] = $row["user_billing_postal_code"];
-		//$vc->data[zzz] = $row["user_billing_country"];
-		//$vc->data[zzz] = $row["user_shipping_address_1"];
-		//$vc->data[zzz] = $row["user_shipping_address_2"];
-		//$vc->data[zzz] = $row["user_shipping_city"];
-		//$vc->data[zzz] = $row["user_shipping_state_province"];
-		//$vc->data[zzz] = $row["user_shipping_postal_code"];
-		//$vc->data[zzz] = $row["user_shipping_country"];
-		$vc->data[office_tel] = $row["user_phone_1"];
-		$vc->data[home_tel] = $row["user_phone_1"];
-		//$vc->data[zzz] = $row["user_phone_1_ext"];
-		//$vc->data[zzz] = $row["user_phone_2"];
-		//$vc->data[zzz] = $row["user_phone_2_ext"];
-		$vc->data[cell_tel] = $row["user_phone_mobile"];
-		$vc->data[fax_tel] = $row["user_phone_fax"];
-		//$vc->data[zzz] = $row["user_phone_emergency_mobile"];
-		//$vc->data[zzz] = $row["user_email_emergency"];
-		$vc->data[email1] = $row["user_email"];
-		$vc->data[url] = $row["user_url"];
-		$vc->data[note] = $row["user_notes"];
-
-		/*
-		//additional un accounted fields
-		additional_name
-		name_prefix
-		name_suffix
-		nickname
-		title
-		role
-		department
-		work_po_box
-		home_po_box
-		home_extended_address
-		home_address
-		home_city
-		home_state
-		home_postal_code
-		home_country
-		pager_tel
-		email2
-		photo
-		birthday
-		timezone
-		sort_string
-		*/
-
-		break; //limit to 1 row
-	}
-	unset ($prep_statement);
-}
-
-$vc->download();
-
-?>

+ 0 - 273
user_contacts/v_config.php

@@ -1,273 +0,0 @@
-<?php
-	//application details
-		$apps[$x]['name'] = "User Contacts";
-		$apps[$x]['uuid'] = 'c82c2d32-301f-d3bd-50ad-34d75419c778';
-		$apps[$x]['category'] = 'System';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['license'] = 'Mozilla Public License 1.1';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en'] = 'Manage User Contacts.';
-
-	//menu details
-		$apps[$x]['menu'][0]['title']['en'] = 'User Contacts';
-		$apps[$x]['menu'][0]['uuid'] = '87ac2ec3-fa23-2a60-6de6-07ac2a8aa4d9';
-		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/user_contacts/users.php';
-		$apps[$x]['menu'][0]['groups'][] = 'admin';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-
-	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'contact_view';
-		$apps[$x]['permissions'][0]['groups'][] = 'admin';
-		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][1]['name'] = 'contact_add';
-		$apps[$x]['permissions'][1]['groups'][] = 'admin';
-		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][2]['name'] = 'contact_edit';
-		$apps[$x]['permissions'][2]['groups'][] = 'admin';
-		$apps[$x]['permissions'][2]['groups'][] = 'superadmin';
-
-		$apps[$x]['permissions'][3]['name'] = 'contact_delete';
-		$apps[$x]['permissions'][3]['groups'][] = 'admin';
-		$apps[$x]['permissions'][3]['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'] = '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'] = '';
-		$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'] = '';
-		$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'] = '';
-		$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'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$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'] = '';
-		$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'] = '';
-		$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'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_type';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_category';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_first_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_last_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_company_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_physical_address_1';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_physical_address_2';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_physical_city';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_physical_state_province';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_physical_country';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_physical_postal_code';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_mailing_address_1';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_mailing_address_2';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_mailing_city';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_mailing_state_province';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_mailing_country';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_mailing_postal_code';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_billing_address_1';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_billing_address_2';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_billing_city';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_billing_state_province';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_billing_country';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_billing_postal_code';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_shipping_address_1';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_shipping_address_2';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_shipping_city';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_shipping_state_province';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_shipping_country';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_shipping_postal_code';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_url';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_phone_1';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_phone_1_ext';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_phone_2';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_phone_2_ext';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_phone_mobile';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_phone_emergency_mobile';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_email_emergency';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_phone_fax';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_template_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_email';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_notes';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_optional_1';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_optional_2';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_status';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_time_zone';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_add_user';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_add_date';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'customer_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
-?>

+ 0 - 0
users_bulk_add/v_config.php → users_bulk_add/app_config.php


+ 0 - 0
users_bulk_add/v_users_bulk_add.php → users_bulk_add/users_bulk_add.php


+ 0 - 19
voicemail_msgs/app_config.php

@@ -18,25 +18,6 @@
 		$apps[$x]['description']['pt-pt'] = 'Mensagens de voz podem ser listadas, jogado, baixado e excluído.';
 		$apps[$x]['description']['pt-br'] = '';
 
-	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Voicemail';
-		$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'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Correio de Voz';
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = 'e10d5672-0f82-6e5d-5022-a02ac8545198';
-		$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/voicemail_msgs/voicemail_msgs.php';
-		$apps[$x]['menu'][0]['groups'][] = 'user';
-		$apps[$x]['menu'][0]['groups'][] = 'admin';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'voicemail_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'user';

+ 21 - 0
voicemail_msgs/app_menu.php

@@ -0,0 +1,21 @@
+<?php
+
+	$apps[$x]['menu'][0]['title']['en-us'] = 'Voicemail';
+	$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'] = '';
+	$apps[$x]['menu'][0]['title']['fr-ca'] = '';
+	$apps[$x]['menu'][0]['title']['fr-ch'] = '';
+	$apps[$x]['menu'][0]['title']['pt-pt'] = 'Correio de Voz';
+	$apps[$x]['menu'][0]['title']['pt-br'] = '';
+	$apps[$x]['menu'][0]['uuid'] = 'e10d5672-0f82-6e5d-5022-a02ac8545198';
+	$apps[$x]['menu'][0]['parent_uuid'] = 'fd29e39c-c936-f5fc-8e2b-611681b266b5';
+	$apps[$x]['menu'][0]['category'] = 'internal';
+	$apps[$x]['menu'][0]['path'] = '/app/voicemail_msgs/voicemail_msgs.php';
+	$apps[$x]['menu'][0]['groups'][] = 'user';
+	$apps[$x]['menu'][0]['groups'][] = 'admin';
+	$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+
+?>

+ 0 - 18
voicemail_status/app_config.php

@@ -18,24 +18,6 @@
 		$apps[$x]['description']['pt-pt'] = 'Mostra quais extensões têm mensagens de voz e quantas.';
 		$apps[$x]['description']['pt-br'] = '';
 
-	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Voicemail Status';
-		$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'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Estado do Correio de Voz';
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = 'ff4ccd3d-e295-7875-04b4-54eb0c74adc5';
-		$apps[$x]['menu'][0]['parent_uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/app/voicemail_status/voicemail.php';
-		$apps[$x]['menu'][0]['groups'][] = 'admin';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
-
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = 'voicemail_status_view';
 		$apps[$x]['permissions'][0]['groups'][] = 'admin';

+ 20 - 0
voicemail_status/app_menu.php

@@ -0,0 +1,20 @@
+<?php
+
+	$apps[$x]['menu'][0]['title']['en-us'] = 'Voicemail Status';
+	$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'] = '';
+	$apps[$x]['menu'][0]['title']['fr-ca'] = '';
+	$apps[$x]['menu'][0]['title']['fr-ch'] = '';
+	$apps[$x]['menu'][0]['title']['pt-pt'] = 'Estado do Correio de Voz';
+	$apps[$x]['menu'][0]['title']['pt-br'] = '';
+	$apps[$x]['menu'][0]['uuid'] = 'ff4ccd3d-e295-7875-04b4-54eb0c74adc5';
+	$apps[$x]['menu'][0]['parent_uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
+	$apps[$x]['menu'][0]['category'] = 'internal';
+	$apps[$x]['menu'][0]['path'] = '/app/voicemail_status/voicemail.php';
+	$apps[$x]['menu'][0]['groups'][] = 'admin';
+	$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+
+?>