nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5893 from greenbea/patch-28

Browse Source 
fix extension settings using wrong class
This commit is contained in:
FusionPBX
2021-04-10 21:49:17 -06:00
committed by GitHub
parent 03429daa19 c2558237f0
commit def4972da0
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/extension_settings/extension_settings.php
View File

@@ -62,34 +62,25 @@
exit; exit;
} }
//prepare the array
foreach($extension_settings as $row) {
$array['extension_settings'][$x]['checked'] = $row['checked'];
$array['extension_settings'][$x]['extension_setting_uuid'] = $row['extension_setting_uuid'];
$array['extension_settings'][$x]['extension_setting_enabled'] = $row['extension_setting_enabled'];
$x++;
}
//prepare the database object //prepare the database object
$database = new database; $obj = new extension_settings;
$database->app_name = 'extension_settings';
$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
//send the array to the database class //send the array to the database class
switch ($action) { switch ($action) {
case 'copy': case 'copy':
if (permission_exists('extension_setting_add')) { if (permission_exists('extension_setting_add')) {
$database->copy($array); $obj->copy($extension_settings);
} }
break; break;
case 'toggle': case 'toggle':
if (permission_exists('extension_setting_edit')) { if (permission_exists('extension_setting_edit')) {
$database->toggle($array); $obj->toggle($extension_settings);
} }
break; break;
case 'delete': case 'delete':
if (permission_exists('extension_setting_delete')) { if (permission_exists('extension_setting_delete')) {
$database->delete($array); $obj->extension_uuid = $extension_uuid;
$obj->delete($extension_settings);
} }
break; break;
} }
@@ -280,7 +271,7 @@
if (permission_exists('extension_setting_add') || permission_exists('extension_setting_edit') || permission_exists('extension_setting_delete')) { if (permission_exists('extension_setting_add') || permission_exists('extension_setting_edit') || permission_exists('extension_setting_delete')) {
echo " <td class='checkbox'>\n"; echo " <td class='checkbox'>\n";
echo " <input type='checkbox' name='extension_settings[$x][checked]' id='checkbox_".$x."' class='checkbox_".$extension_setting_type."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all_".$extension_setting_type."').checked = false; }\">\n"; echo " <input type='checkbox' name='extension_settings[$x][checked]' id='checkbox_".$x."' class='checkbox_".$extension_setting_type."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all_".$extension_setting_type."').checked = false; }\">\n";
echo " <input type='hidden' name='extension_settings[$x][extension_setting_uuid]' value='".escape($row['extension_setting_uuid'])."' />\n"; echo " <input type='hidden' name='extension_settings[$x][uuid]' value='".escape($row['extension_setting_uuid'])."' />\n";
echo " </td>\n"; echo " </td>\n";
} }
//if ($_GET['show'] == 'all' && permission_exists('extension_setting_all')) { //if ($_GET['show'] == 'all' && permission_exists('extension_setting_all')) {

2
app/extension_settings/resources/classes/extension_settings.php
View File

@@ -116,7 +116,7 @@ if (!class_exists('extension_settings')) {
//clear the cache //clear the cache
$sql = "select extension, number_alias, user_context from v_extensions "; $sql = "select extension, number_alias, user_context from v_extensions ";
$sql .= "where extension_uuid = :extension_uuid "; $sql .= "where extension_uuid = :extension_uuid ";
$parameters['extension_uuid'] = $extension_uuid; $parameters['extension_uuid'] = $this->extension_uuid;
$database = new database; $database = new database;
$extension = $database->select($sql, $parameters, 'row'); $extension = $database->select($sql, $parameters, 'row');
$cache = new cache; $cache = new cache;