diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php index 259f0f3dbc..277acc1952 100644 --- a/app/call_flows/call_flows.php +++ b/app/call_flows/call_flows.php @@ -108,7 +108,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('call_flow_status', $text['label-status'], $order_by, $order); //echo th_order_by('call_flow_name', $text['label-name'], $order_by, $order); @@ -122,11 +122,12 @@ require_once "resources/paging.php"; echo "$v_link_label_add"; } echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = (permission_exists('call_flow_edit')) ? "href='call_flow_edit.php?id=".$row['call_flow_uuid']."'" : null; + echo "\n"; echo "
"; if ($row['call_flow_status'] != "false") { echo $row['call_flow_label']; diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index 5d3efa9b2c..9d4e564fc1 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -144,7 +144,7 @@ else { $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('conference_center_name', $text['label-name'], $order_by, $order); echo th_order_by('conference_center_extension', $text['label-extension'], $order_by, $order); @@ -159,13 +159,14 @@ else { echo "  \n"; } echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { $conference_center_name = $row['conference_center_name']; $conference_center_name = str_replace("-", " ", $conference_center_name); - echo "\n"; + $tr_link = (permission_exists('conference_center_edit')) ? "href='conference_center_edit.php?id=".$row['conference_center_uuid']."'" : null; + echo "\n"; echo "
"; if (permission_exists('conference_center_edit')) { echo "".$conference_center_name.""; diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index d3663ef90c..99424d736b 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -211,7 +211,7 @@ else { //table header echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; //echo th_order_by('conference_center_uuid', 'Conference UUID', $order_by, $order); //echo th_order_by('meeting_uuid', 'Meeting UUID', $order_by, $order); @@ -241,7 +241,7 @@ else { echo "  \n"; } echo "\n"; - echo "\n"; + echo "\n"; //table data if ($result_count > 0) { @@ -256,7 +256,8 @@ else { $participant_pin = substr($participant_pin, 0, 3) ."-". substr($participant_pin, 3, 3) ."-". substr($participant_pin, -3)."\n"; } - echo "\n"; + $tr_link = (permission_exists('conference_room_edit')) ? "href='conference_room_edit.php?id=".$row['conference_room_uuid']."'" : null; + echo "\n"; echo " \n"; echo " \n"; //echo " \n"; diff --git a/app/conference_centers/conference_session_details.php b/app/conference_centers/conference_session_details.php index b854b92065..1e0bf636b6 100644 --- a/app/conference_centers/conference_session_details.php +++ b/app/conference_centers/conference_session_details.php @@ -49,7 +49,7 @@ else { $conference_session_uuid = check_str($_GET["uuid"]); //add meeting_uuid to a session variable - if (strlen($conference_session_uuid) > 0) { + if (strlen($conference_session_uuid) > 0) { $_SESSION['meeting']['session_uuid'] = $conference_session_uuid; } @@ -138,9 +138,9 @@ else { $rows_per_page = 500; $param = ""; $page = $_GET['page']; - if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } - list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); - $offset = $rows_per_page * $page; + if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } + list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); + $offset = $rows_per_page * $page; //get the list $sql = "select * from v_conference_session_details "; @@ -150,7 +150,7 @@ else { $sql .= "order by start_epoch asc "; } else { - $sql .= "order by $order_by $order "; + $sql .= "order by $order_by $order "; } $sql .= "limit $rows_per_page offset $offset "; $prep_statement = $db->prepare(check_sql($sql)); @@ -164,7 +164,7 @@ else { $row_style["1"] = "row_style1"; echo "
\n"; - echo "
".$moderator_pin."".$participant_pin."".$row['conference_center_uuid']." 
\n"; + echo "
\n"; echo "\n"; //echo th_order_by('meeting_uuid', 'Meeting UUID', $order_by, $order); //echo th_order_by('conference_uuid', 'Conference UUID', $order_by, $order); @@ -178,9 +178,9 @@ else { echo th_order_by('start_epoch', $text['label-start'], $order_by, $order); echo th_order_by('end_epoch', $text['label-end'], $order_by, $order); if (permission_exists('conference_session_details')) { - echo "\n"; + echo "\n"; } - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { @@ -196,18 +196,21 @@ else { $time_difference = $row['end_epoch'] - $row['start_epoch']; $time_difference = gmdate("G:i:s", $time_difference); } - echo "\n"; + $tr_link = (permission_exists('conference_session_details')) ? "href='/app/xml_cdr/xml_cdr_details.php?uuid=".$row['uuid']."'" : null; + echo "\n"; //echo " \n"; //echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; if (permission_exists('conference_session_details')) { - echo " \n"; + echo " \n"; } echo "\n"; if ($c==0) { $c=1; } else { $c=0; } diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php index 37930a3620..b61d2ec66e 100644 --- a/app/conference_centers/conference_sessions.php +++ b/app/conference_centers/conference_sessions.php @@ -49,7 +49,7 @@ else { $order = check_str($_GET["order"]); //add meeting_uuid to a session variable - if (strlen($meeting_uuid) > 0) { + if (strlen($meeting_uuid) > 0) { $_SESSION['meeting']['uuid'] = $meeting_uuid; } @@ -92,9 +92,9 @@ else { $rows_per_page = 150; $param = ""; $page = $_GET['page']; - if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } - list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); - $offset = $rows_per_page * $page; + if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } + list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); + $offset = $rows_per_page * $page; //get the list $sql = "select * from v_conference_sessions "; @@ -104,7 +104,7 @@ else { $sql .= "order by start_epoch desc "; } else { - $sql .= "order by $order_by $order "; + $sql .= "order by $order_by $order "; } $sql .= "limit $rows_per_page offset $offset "; $prep_statement = $db->prepare(check_sql($sql)); @@ -118,7 +118,7 @@ else { $row_style["1"] = "row_style1"; echo "
\n"; - echo "
".$text['label-details']." 
".$row['meeting_uuid']." ".$row['conference_session_uuid']." ".$row['caller_id_name']." ".$row['caller_id_number']." ".$row['moderator']." ".ucwords($row['moderator'])." ".$row['network_addr']." ".$time_difference." ".$start_date." ".$end_date." ".$text['label-cdr']." "; + echo " $v_link_label_view"; + echo "
\n"; + echo "
\n"; echo "\n"; echo "\n"; echo th_order_by('start_epoch', $text['label-start'], $order_by, $order); @@ -126,7 +126,8 @@ else { echo th_order_by('profile', $text['label-profile'], $order_by, $order); //echo th_order_by('recording', $text['label-recording'], $order_by, $order); echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { @@ -148,7 +149,8 @@ else { } if (strlen( $row['start_epoch']) > 0) { - echo "\n"; + $tr_link = "href='conference_session_details.php?uuid=".$row['conference_session_uuid']."'"; + echo "\n"; echo " \n"; echo " \n"; echo " \n"; @@ -162,7 +164,6 @@ else { $tmp_name = $row['conference_session_uuid'].".wav"; } echo " \n"; + echo " \n"; echo "\n"; } diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php index 8c23aa4aed..fa5dabb85a 100644 --- a/app/contacts/app_languages.php +++ b/app/contacts/app_languages.php @@ -415,6 +415,16 @@ $text['label-address_tools']['pt-pt'] = "Ferramentas"; $text['label-address_tools']['fr-fr'] = "Outils"; + $text['option-home']['en-us'] = "Home"; + $text['option-home']['es-cl'] = "Casa"; + $text['option-home']['pt-pt'] = "Casa"; + $text['option-home']['fr-fr'] = "Maison"; + + $text['option-work']['en-us'] = "Work"; + $text['option-work']['es-cl'] = "Lugar de Trabajo"; + $text['option-work']['pt-pt'] = "Local de Trabalho"; + $text['option-work']['fr-fr'] = "En Milieu de Travail"; + // contact extensions $text['label-contact_extensions']['en-us'] = "Extensions"; $text['label-contact_extensions']['es-cl'] = "Extensións"; diff --git a/app/contacts/contact_address_edit.php b/app/contacts/contact_address_edit.php index a37bf94b20..e80b5921e8 100644 --- a/app/contacts/contact_address_edit.php +++ b/app/contacts/contact_address_edit.php @@ -264,16 +264,16 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; } diff --git a/app/contacts/contact_addresses.php b/app/contacts/contact_addresses.php index 258288e2a6..e688a9e167 100644 --- a/app/contacts/contact_addresses.php +++ b/app/contacts/contact_addresses.php @@ -92,7 +92,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "
".$text['label-time']."".$text['label-tools']."
 
".$time_difference." ".$start_date." ".$end_date." \n"; - echo " ".$text['label-details']." \n"; if (strlen($tmp_name) > 0 && file_exists($tmp_dir.'/'.$tmp_name)) { if (permission_exists('conference_session_play')) { echo " \n"; @@ -175,6 +176,12 @@ else { echo " \n"; echo "  \n"; } + else { + echo " "; + } + echo " "; + echo " $v_link_label_view"; echo "
\n"; + echo "
\n"; echo "\n"; echo th_order_by('address_type', $text['label-address_type'], $order_by, $order); @@ -109,14 +109,15 @@ require_once "resources/paging.php"; echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { $map_query = $row['address_street']." ".$row['address_extended'].", ".$row['address_locality'].", ".$row['address_region'].", ".$row['address_region'].", ".$row['address_postal_code']; - echo "\n"; + $tr_link = "href='contact_address_edit.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_address_uuid']."'"; + echo "\n"; //echo " \n"; - echo " \n"; + echo " \n"; //echo " \n"; //echo " \n"; echo " \n"; @@ -125,10 +126,10 @@ require_once "resources/paging.php"; echo " \n"; //echo " \n"; //echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; echo "
"; echo "$v_link_label_add"; echo "
".$row['address_name']." ".$row['address_type']." ".ucwords($row['address_type'])." ".$row['address_street']." ".$row['address_extended']." ".$row['address_locality']." ".$row['address_country']." ".$row['address_latitude']." ".$row['address_longitude']." \n"; + echo " \n"; echo " Map \n"; echo " ".$row['address_description']." ".$row['address_description']." "; echo "$v_link_label_edit"; echo "$v_link_label_delete"; diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 30188fe593..6aadab1689 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -247,7 +247,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "
\n"; + echo "\n"; echo "
\n"; echo "\n"; @@ -537,7 +537,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo ""; - echo "
  \n"; + echo "\n"; //echo "

\n"; require "contact_phones.php"; require "contact_addresses.php"; diff --git a/app/contacts/contact_extensions.php b/app/contacts/contact_extensions.php index a7f9ff0e4d..71a87ae7b0 100644 --- a/app/contacts/contact_extensions.php +++ b/app/contacts/contact_extensions.php @@ -115,7 +115,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('extension', $text['label-extension'], $order_by, $order); echo th_order_by('enabled', $text['label-enabled'], $order_by, $order); @@ -125,10 +125,11 @@ require_once "resources/paging.php"; echo " $v_link_label_add\n"; } echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = (permission_exists('extension_edit')) ? "href='/app/extensions/extension_edit.php?id=".$row['extension_uuid']."'" : null; + echo "\n"; echo "
"; if (permission_exists('extension_edit')) { echo "".$row['extension'].""; diff --git a/app/contacts/contact_notes.php b/app/contacts/contact_notes.php index 7603ba09f3..ab5192730a 100644 --- a/app/contacts/contact_notes.php +++ b/app/contacts/contact_notes.php @@ -100,14 +100,12 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; if ($result_count == 0) { echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -117,7 +115,7 @@ require_once "resources/paging.php"; $contact_note = $row['contact_note']; $contact_note = str_replace("\n","
",$contact_note); - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; - - echo "\n"; + echo "\n"; + $tr_link = "href='contact_note_edit.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_note_uuid']."'"; + echo "\n"; echo " \n"; //echo " \n"; //echo " \n"; @@ -139,10 +137,6 @@ require_once "resources/paging.php"; echo " \n"; echo "\n"; - echo "\n"; - echo " \n"; - echo "\n"; - if ($c==0) { $c=1; } else { $c=0; } } //end foreach unset($sql, $result, $row_count); diff --git a/app/contacts/contact_phones.php b/app/contacts/contact_phones.php index bf438854be..deefcb802e 100644 --- a/app/contacts/contact_phones.php +++ b/app/contacts/contact_phones.php @@ -107,7 +107,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "
\n"; - echo "   \n"; - echo ""; + echo " "; echo "$v_link_label_add"; echo "
\n"; echo " ".$row['last_mod_date']."    \n"; echo " ".$row['last_mod_user']."     \n"; @@ -127,9 +125,9 @@ require_once "resources/paging.php"; echo "\n"; echo " $v_link_label_add\n"; echo "
".$contact_note." ".$row['last_mod_date']." ".$row['last_mod_user']." 
 
\n"; + echo "
\n"; echo "\n"; echo th_order_by('phone_type', $text['label-phone_type'], $order_by, $order); echo th_order_by('phone_number', $text['label-phone_number'], $order_by, $order); @@ -116,22 +116,23 @@ require_once "resources/paging.php"; echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; - echo " \n"; + $tr_link = "href='contact_phone_edit.php?contact_uuid=".$row['contact_uuid']."&id=".$row['contact_phone_uuid']."'"; + echo "\n"; + echo " \n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; echo "
"; echo "$v_link_label_add"; echo "
".$row['phone_type']." 
".ucwords($row['phone_type'])." \n"; echo " \n"; echo " ".format_phone($row['phone_number'])." \n"; echo " \n"; + echo " \n"; echo " ".$text['label-phone_call']."\n"; echo "  \n"; echo " CDR\n"; echo "  \n"; echo " ".$row['phone_description']." ".$row['phone_description']." "; echo "$v_link_label_edit"; echo "$v_link_label_delete"; diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php index dfa0f54521..6f9ab72d04 100644 --- a/app/contacts/contacts.php +++ b/app/contacts/contacts.php @@ -182,7 +182,7 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('contact_type', $text['label-contact_type'], $order_by, $order); echo th_order_by('contact_organization', $text['label-contact_organization'], $order_by, $order); @@ -199,11 +199,12 @@ require_once "resources/paging.php"; echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { - echo "\n"; + $tr_link = "href='contact_edit.php?id=".$row['contact_uuid']."&query_string=".urlencode($_SERVER["QUERY_STRING"])."'"; + echo "\n"; echo " \n"; echo " \n"; echo " \n"; diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php index d206f5f441..02dc02ac14 100644 --- a/app/xml_cdr/xml_cdr.php +++ b/app/xml_cdr/xml_cdr.php @@ -445,7 +445,7 @@ else { } echo " \n"; if (if_group("admin") || if_group("superadmin")) { - echo " \n"; }
"; echo "$v_link_label_add"; echo "
".ucwords($row['contact_type'])." ".$row['contact_organization']." ".$row['contact_name_given']." "; + echo " "; echo " $v_link_label_view"; echo "