diff --git a/app/provision/app_defaults.php b/app/provision/app_defaults.php index 7a0583fdb8..377fddc7d2 100644 --- a/app/provision/app_defaults.php +++ b/app/provision/app_defaults.php @@ -59,37 +59,31 @@ if ($domains_processed == 1) { unset($sql, $result, $row); //update http_auth_enabled set to true - $sql = "select * from v_default_settings "; + $sql = "select count(*) from v_default_settings "; $sql .= "where default_setting_subcategory = 'http_auth_disable' "; - $database = new database; - $result = $database->select($sql, null, 'all'); - if (is_array($result) && @sizeof($result) != 0) { - foreach ($result as $x => $row) { - //determine value - $default_setting_value = $row["default_setting_value"] == 'false' && $row["default_setting_enabled"] == 'true' ? 'false' : 'true'; - //build update array - $array['default_settings'][$x]['default_setting_uuid'] = 'c998c762-6a43-4911-a465-a9653eeb793d'; - $array['default_settings'][$x]['default_setting_subcategory'] = 'http_auth_enabled'; - $array['default_settings'][$x]['default_setting_value'] = $default_setting_value; - $array['default_settings'][$x]['default_setting_enabled'] = 'true'; - } - if (is_array($array) && @sizeof($array) != 0) { - //grant temporary permissions - $p = new permissions; - $p->add('default_setting_add', 'temp'); - //execute update - $database = new database; - $database->app_name = 'provision'; - $database->app_uuid = 'abf28ead-92ef-3de6-ebbb-023fbc2b6dd3'; - $database->save($array); - unset($array); - //grant temporary permissions - $p = new permissions; - $p->delete('default_setting_add', 'temp'); - } + if ($database->select($sql, null, 'column') > 0) { + //build update array + $array['default_settings'][$x]['default_setting_uuid'] = 'c998c762-6a43-4911-a465-a9653eeb793d'; + $array['default_settings'][$x]['default_setting_subcategory'] = 'http_auth_enabled'; + $array['default_settings'][$x]['default_setting_value'] = 'true'; + $array['default_settings'][$x]['default_setting_enabled'] = 'true'; + //grant temporary permissions + $p = new permissions; + $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); + unset($array); + + //grant temporary permissions + $p = new permissions; + $p->delete('default_setting_edit', 'temp'); } - unset($sql, $result, $row); + unset($sql); //update default settings $sql = "update v_default_settings set ";