dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix contact import and extension import button

This commit is contained in:
markjcrane 2023-06-20 08:10:57 -06:00
parent bcf7cbaad2
commit fcda82136f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/contacts/contact_import.php
View File

@ -112,8 +112,8 @@
$schema[$i]['table'] = $table_name;
$schema[$i]['parent'] = $parent_name;
foreach ($table['fields'] as $row) {
if (!empty($row['deprecated']) && $row['deprecated'] !== 'true') {
if (!empty($row['name'])) {
if (empty($row['deprecated']) || !empty($row['deprecated']) && $row['deprecated'] !== 'true') {
if (!empty($row['name']['text'])) {
$field_name = $row['name']['text'];
}
else {
@ -274,9 +274,9 @@
}
//user selected fields, labels
$fields = $_POST['fields'];
$fields = $_POST['fields'] ?? [];
$labels = $_POST['labels'] ?? [];
//set the domain_uuid
$domain_uuid = $_SESSION['domain_uuid'];

2
app/extensions/extensions.php
View File

@ -171,7 +171,7 @@
echo "<div class='action_bar' id='action_bar'>\n";
echo " <div class='heading'><b>".$text['header-extensions']." (".$num_rows.")</b></div>\n";
echo " <div class='actions'>\n";
if (permission_exists('extension_import') && (!isset($_SESSION['limit']['extensions']['numeric']) || $total_extensions < $_SESSION['limit']['extensions']['numeric'])) {
if (permission_exists('extension_import') || (!isset($_SESSION['limit']['extensions']['numeric']) || $total_extensions < $_SESSION['limit']['extensions']['numeric'])) {
echo button::create(['type'=>'button','label'=>$text['button-import'],'icon'=>$_SESSION['theme']['button_icon_import'],'link'=>'extension_imports.php']);
}
if (permission_exists('extension_export')) {