From 31f2d565bf3b9e7de9bbe9d454bb62928a86cd8a Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Tue, 12 Nov 2013 15:56:26 +0000 Subject: [PATCH] Add hostname to sip profiles. --- app/sip_profiles/app_config.php | 53 +++--- app/sip_profiles/app_languages.php | 255 +++++++++++++++----------- app/sip_profiles/sip_profile_edit.php | 16 ++ app/sip_profiles/sip_profiles.php | 17 +- 4 files changed, 203 insertions(+), 138 deletions(-) diff --git a/app/sip_profiles/app_config.php b/app/sip_profiles/app_config.php index 8f7dd5fd00..be7a01f729 100644 --- a/app/sip_profiles/app_config.php +++ b/app/sip_profiles/app_config.php @@ -36,31 +36,31 @@ $apps[$x]['menu'][0]['groups'][] = "superadmin"; //permission details - $y = 0; - $apps[$x]['permissions'][$y]['name'] = "sip_profile_view"; + $y = 0; + $apps[$x]['permissions'][$y]['name'] = "sip_profile_view"; $apps[$x]['permissions'][$y]['menu']['uuid'] = "47014b1d-13ad-921c-313d-ca42c0424b37"; - $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; - $y++; - $apps[$x]['permissions'][$y]['name'] = "sip_profile_add"; - $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; - $y++; - $apps[$x]['permissions'][$y]['name'] = "sip_profile_edit"; - $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; - $y++; - $apps[$x]['permissions'][$y]['name'] = "sip_profile_delete"; - $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; - $y++; - $apps[$x]['permissions'][$y]['name'] = "sip_profile_setting_view"; - $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; - $y++; - $apps[$x]['permissions'][$y]['name'] = "sip_profile_setting_add"; - $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; - $y++; - $apps[$x]['permissions'][$y]['name'] = "sip_profile_setting_edit"; - $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; - $y++; - $apps[$x]['permissions'][$y]['name'] = "sip_profile_setting_delete"; - $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; + $apps[$x]['permissions'][$y]['name'] = "sip_profile_add"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; + $apps[$x]['permissions'][$y]['name'] = "sip_profile_edit"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; + $apps[$x]['permissions'][$y]['name'] = "sip_profile_delete"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; + $apps[$x]['permissions'][$y]['name'] = "sip_profile_setting_view"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; + $apps[$x]['permissions'][$y]['name'] = "sip_profile_setting_add"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; + $apps[$x]['permissions'][$y]['name'] = "sip_profile_setting_edit"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $y++; + $apps[$x]['permissions'][$y]['name'] = "sip_profile_setting_delete"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $y++; $apps[$x]['permissions'][$y]['name'] = "sip_profile_setting_view"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; @@ -124,4 +124,9 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description."; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "sip_profile_hostname"; + $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "varchar(255)"; + $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "vachar(255)"; + $z++; ?> \ No newline at end of file diff --git a/app/sip_profiles/app_languages.php b/app/sip_profiles/app_languages.php index d998891594..121d265e3f 100644 --- a/app/sip_profiles/app_languages.php +++ b/app/sip_profiles/app_languages.php @@ -1,122 +1,159 @@ diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php index efde0f7691..7204d88dc6 100644 --- a/app/sip_profiles/sip_profile_edit.php +++ b/app/sip_profiles/sip_profile_edit.php @@ -53,6 +53,7 @@ else { if (count($_POST)>0) { $sip_profile_name = check_str($_POST["sip_profile_name"]); $sip_profile_description = check_str($_POST["sip_profile_description"]); + $sip_profile_hostname = check_str($_POST["sip_profile_hostname"]); } if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { @@ -86,12 +87,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "("; $sql .= "sip_profile_uuid, "; $sql .= "sip_profile_name, "; + $sql .= "sip_profile_hostname, "; $sql .= "sip_profile_description "; $sql .= ")"; $sql .= "values "; $sql .= "("; $sql .= "'".uuid()."', "; $sql .= "'$sip_profile_name', "; + $sql .= "'$sip_profile_hostname', "; $sql .= "'$sip_profile_description' "; $sql .= ")"; $db->exec(check_sql($sql)); @@ -102,6 +105,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { $sql = "update v_sip_profiles set "; $sql .= "sip_profile_name = '$sip_profile_name', "; + $sql .= "sip_profile_hostname = '$sip_profile_hostname', "; $sql .= "sip_profile_description = '$sip_profile_description' "; $sql .= "where sip_profile_uuid = '$sip_profile_uuid'"; $db->exec(check_sql($sql)); @@ -136,6 +140,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $result = $prep_statement->fetchAll(); foreach ($result as &$row) { $sip_profile_name = $row["sip_profile_name"]; + $sip_profile_hostname = $row["sip_profile_hostname"]; $sip_profile_description = $row["sip_profile_description"]; break; //limit to 1 row } @@ -180,6 +185,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " ".$text['label-hostname'].":\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['description-hostname']."\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " ".$text['label-description'].":\n"; diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php index 30fbd86055..9f04981705 100644 --- a/app/sip_profiles/sip_profiles.php +++ b/app/sip_profiles/sip_profiles.php @@ -58,8 +58,12 @@ require_once "resources/paging.php"; echo "\n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo "
".$text['header-sip_profiles']." ".$text['header-sip_profiles']." 
".$text['header-hostname']." 
\n"; @@ -109,6 +113,7 @@ require_once "resources/paging.php"; echo "\n"; echo "\n"; echo th_order_by('sip_profile_name', $text['label-name'], $order_by, $order); + echo "\n"; echo "\n"; echo "\n"; echo " \n"; + echo " \n"; echo " \n"; echo "
".$text['label-hostname']."".$text['label-description']."\n"; if (permission_exists('sip_profile_add')) { @@ -121,6 +126,7 @@ require_once "resources/paging.php"; foreach($result as $row) { echo "
".$row['sip_profile_name']." ".$row['sip_profile_hostname']." ".$row['sip_profile_description']." \n"; if (permission_exists('sip_profile_edit')) { @@ -140,9 +146,10 @@ require_once "resources/paging.php"; echo "\n"; echo " \n"; echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; + echo "
 $paging_controls\n"; + echo "   $paging_controls\n"; if (permission_exists('sip_profile_add')) { echo " $v_link_label_add\n"; }