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

Remove session from provisioning (#7014)

Browse Source 
* use single database object, use settings class

* add common domain functions

* use settings class
This commit is contained in:
frytimo
2024-06-22 19:28:04 -06:00
committed by GitHub
parent 81af0fefd1
commit fcd64fcce6
4 changed files with 54 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/provision/app_defaults.php
+5 -10
View File
@@ -31,9 +31,9 @@ if ($domains_processed == 1) {
$sql = "select device_uuid, device_address ";
$sql .= "from v_devices ";
$sql .= "where (device_address like '%-%' or device_address like '%:%') ";
$database = new database;
$database = database::new();
$result = $database->select($sql, null, 'all');
if (is_array($result) && @sizeof($result) != 0) {
if (!empty($result)) {
foreach ($result as $row) {
//define update values
$device_uuid = $row["device_uuid"];
@@ -47,7 +47,6 @@ if ($domains_processed == 1) {
$p = new permissions;
$p->add('device_add', 'temp');
//execute update
$database = new database;
$database->app_name = 'provision';
$database->app_uuid = 'abf28ead-92ef-3de6-ebbb-023fbc2b6dd3';
$database->save($array, false);
@@ -56,7 +55,7 @@ if ($domains_processed == 1) {
$p->delete('device_add', 'temp');
}
}
unset($sql, $result, $row);
unset($sql, $result, $row, $p);
//update http_auth_enabled set to true
$sql = "select count(*) from v_default_settings ";
@@ -73,15 +72,14 @@ if ($domains_processed == 1) {
$p->add('default_setting_edit', 'temp');
//execute update
$database = new database;
$database->app_name = 'provision';
$database->app_uuid = 'abf28ead-92ef-3de6-ebbb-023fbc2b6dd3';
$database->save($array, false);
unset($array);
//grant temporary permissions
$p = new permissions;
//revoke temporary permissions
$p->delete('default_setting_edit', 'temp');
unset($p);
}
unset($sql);
@@ -95,7 +93,6 @@ if ($domains_processed == 1) {
$sql .= "and default_setting_name = 'text' ";
$sql .= "and default_setting_value = 'false' ";
$sql .= "and default_setting_enabled = 'false' ";
$database = new database;
$database->execute($sql);
//update default settings
@@ -104,7 +101,6 @@ if ($domains_processed == 1) {
$sql .= "where default_setting_category = 'provision' ";
$sql .= "and default_setting_subcategory = 'http_auth_password' ";
$sql .= "and default_setting_name = 'text' ";
$database = new database;
$database->execute($sql);
//update domain settings
@@ -113,7 +109,6 @@ if ($domains_processed == 1) {
$sql .= "where domain_setting_category = 'provision' ";
$sql .= "and domain_setting_subcategory = 'http_auth_password' ";
$sql .= "and domain_setting_name = 'text' ";
$database = new database;
$database->execute($sql);
}