' +
@@ -99,7 +101,7 @@ var BazProgress = function() {
);
}
- if (hasRemoteWeb) {
+ if (hasSubProcess) {
$(element).append(
'
'
);
}
+
+ if (hasCancelButton) {
+ $(element).append(
+ '
'
+ );
+
+ $('#' + $(element)[0].id + '-cancel').off();
+ $('#' + $(element)[0].id + '-cancel').click(function() {
+ if (pid > 0) {
+ Swal.fire({
+ title : '
',
+ icon : 'question',
+ background : 'rgba(0,0,0,.8)',
+ backdrop : 'rgba(0,0,0,.6)',
+ buttonsStyling : false,
+ confirmButtonText : 'Yes',
+ customClass : {
+ 'confirmButton' : 'btn btn-danger btn-sm text-uppercase',
+ 'cancelButton' : 'ml-2 btn btn-secondary btn-sm text-uppercase',
+ },
+ showCancelButton : true,
+ keydownListenerCapture : true,
+ allowOutsideClick : true,
+ allowEscapeKey : true,
+ didOpen : function() {
+ dataCollection.env.sounds.swalSound.play();
+ }
+ }).then((result) => {
+ if (result.value) {
+ var cancelUrl =
+ dataCollection.env.httpScheme + '://' +
+ dataCollection.env.httpHost + '/' +
+ dataCollection.env.appRoute + '/system/progress/cancelProgress';
+
+ var postData = { };
+ postData[$('#security-token').attr('name')] = $('#security-token').val();
+
+ if (progressFile) {
+ postData['file_name'] = progressFile;
+ }
+
+ $.post(cancelUrl, postData, function(response) {
+ if (response.responseCode == 0) {
+ paginatedPNotify('success', {
+ 'title' : response.responseMessage
+ });
+
+ resetProgressCounter();
+ } else {
+ paginatedPNotify('error', {
+ 'title' : response.responseMessage
+ });
+ }
+ }, 'json');
+ }
+ });
+ }
+ });
+ }
}
function getProgress(options) {
@@ -167,6 +232,15 @@ var BazProgress = function() {
responseData = response.responseData;
}
+ if (responseData['pid']) {
+ $('#' + $(element)[0].id + '-cancel').attr('hidden', false);
+ pid = responseData['pid'];
+ }
+
+ if (responseData['progressFile']) {
+ progressFile = responseData['progressFile'];
+ }
+
if (responseData['preCheckComplete'] == false ||
(responseData['callResult'] && responseData['callResult'] === 'reset')
) {
@@ -202,6 +276,14 @@ var BazProgress = function() {
$('.' + $(element)[0].id + '-remote-bar').css('width', responseData['percentComplete'] + '%');
$('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', responseData['percentComplete']);
+
+ if ($('.' + $(element)[0].id + '-progress-span').html() === '') {
+ $('.' + $(element)[0].id + '-progress-span')
+ .html(responseData['runners']['running']['text'] + ' (' + responseData['totalPercentComplete'] + '%)');
+
+ $('.' + $(element)[0].id + '-bar').css('width', responseData['totalPercentComplete'] + '%');
+ $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', responseData['totalPercentComplete']);
+ }
} else {
$('.progress-remote, .remote-progress-span').attr('hidden', true);
@@ -236,6 +318,14 @@ var BazProgress = function() {
$('.' + $(element)[0].id + '-remote-bar').css('width', responseData['percentComplete'] + '%');
$('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', responseData['percentComplete']);
+
+ if ($('.' + $(element)[0].id + '-progress-span').html() === '') {
+ $('.' + $(element)[0].id + '-progress-span')
+ .html(responseData['runners']['running']['text'] + ' (' + responseData['totalPercentComplete'] + '%)');
+
+ $('.' + $(element)[0].id + '-bar').css('width', responseData['totalPercentComplete'] + '%');
+ $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', responseData['totalPercentComplete']);
+ }
} else {
$('.' + $(element)[0].id + '-remote-bar').css('width', '0%');
$('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', 0);
@@ -245,10 +335,10 @@ var BazProgress = function() {
$('.progress-remote, .remote-progress-span').attr('hidden', true);
$('.' + $(element)[0].id + '-progress-span')
- .html(responseData['runners']['running']['text'] + ' (' + responseData['percentComplete'] + '%)');
+ .html(responseData['runners']['running']['text'] + ' (' + responseData['totalPercentComplete'] + '%)');
- $('.' + $(element)[0].id + '-bar').css('width', responseData['percentComplete'] + '%');
- $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', responseData['percentComplete']);
+ $('.' + $(element)[0].id + '-bar').css('width', responseData['totalPercentComplete'] + '%');
+ $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', responseData['totalPercentComplete']);
}
}
} else {
@@ -305,6 +395,8 @@ var BazProgress = function() {
isUpload = false;
isDownload = false;
isSteps = false;
+ pid = 0;
+ progressFile = null;
$('.' + $(element)[0].id + '-child-bar').css('width', '0%');
$('.' + $(element)[0].id + '-child-bar').attr('aria-valuenow', 0);
switchProgressBarColor('.' + $(element)[0].id + '-child-bar', 'info');
@@ -312,6 +404,7 @@ var BazProgress = function() {
$('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', 0);
switchProgressBarColor('.' + $(element)[0].id + '-remote-bar', 'info');
$('.progress-remote, .remote-progress-span').attr('hidden', true);
+ $('#' + $(element)[0].id + '-cancel').attr('hidden', true);
$('body').trigger('bazProgressComplete');
}
} else {
@@ -410,6 +503,8 @@ var BazProgress = function() {
isUpload = false;
isDownload = false;
isSteps = false;
+ pid = 0;
+ progressFile = null;
$('body').trigger({'type':'bazProgressComplete', 'reset' : true});
}
@@ -448,12 +543,15 @@ var BazProgress = function() {
getProgress(options);
}
}
- BazProgress.buildProgressBar = function(el, mSH = false, child = false, remoteWeb = false) {
- buildProgressBar(el, mSH, child, remoteWeb);
+ BazProgress.buildProgressBar = function(el, mSH = false, child = false, hasSubProcess = false, hasCancelButton = true) {
+ buildProgressBar(el, mSH, child, hasSubProcess, hasCancelButton);
}
BazProgress.switchProgressBarColor = function(el, color) {
switchProgressBarColor(el, color);
}
+ BazProgress.resetProgressCounter = function() {
+ resetProgressCounter();
+ }
BazProgress.setCallable = function(callable) {
setCallable(callable);
}
@@ -465,4 +563,4 @@ var BazProgress = function() {
setup(bazProgressConstructor);
return bazProgressConstructor;
-}();
\ No newline at end of file
+}();
diff --git a/public/core/default/js/footer/jsFooterCore.js b/public/core/default/js/footer/jsFooterCore.js
index 59e736cb4..6ad89299b 100644
--- a/public/core/default/js/footer/jsFooterCore.js
+++ b/public/core/default/js/footer/jsFooterCore.js
@@ -11826,7 +11826,7 @@ var BazAnnouncements = function() {
return bazAnnouncementsConstructor;
}();
/* exported BazProgress */
-/* globals BazHelpers */
+/* globals BazHelpers paginatedPNotify Swal dataCollection */
/*
* @title : BazProgress
* @description : Baz Progress Lib
@@ -11845,9 +11845,8 @@ var BazProgress = function() {
var initialized = false;
var progressCounter = 0;
var online = false;
- var element, manualShowHide, hasChild, hasRemoteWeb;
+ var element, manualShowHide, hasChild, hasSubProcess, hasCancelButton;
var callableFunc = null;
- var dataCollection = window.dataCollection;
var url
var postData = { };
var progressOptions;
@@ -11860,6 +11859,8 @@ var BazProgress = function() {
var isUpload = false;
var isDownload = false;
var isSteps = false;
+ var pid = 0;
+ var progressFile = null;
// Error
// function error(errorMsg) {
// throw new Error(errorMsg);
@@ -11894,11 +11895,12 @@ var BazProgress = function() {
console.log('Progress service offline');
}
- function buildProgressBar(el, mSH = false, hC = false, hRW = false) {
+ function buildProgressBar(el, mSH = false, hC = false, hSP = false, hCB = true) {
element = el;
manualShowHide = mSH;
hasChild = hC;
- hasRemoteWeb = hRW;
+ hasSubProcess = hSP;
+ hasCancelButton = hCB;
$(element).html(
'
' +
@@ -11926,7 +11928,7 @@ var BazProgress = function() {
);
}
- if (hasRemoteWeb) {
+ if (hasSubProcess) {
$(element).append(
'
' +
'
' +
@@ -11939,6 +11941,69 @@ var BazProgress = function() {
'
'
);
}
+
+ if (hasCancelButton) {
+ $(element).append(
+ '
' +
+ '' +
+ '
'
+ );
+
+ $('#' + $(element)[0].id + '-cancel').off();
+ $('#' + $(element)[0].id + '-cancel').click(function() {
+ if (pid > 0) {
+ Swal.fire({
+ title : '
Cancel current process?',
+ icon : 'question',
+ background : 'rgba(0,0,0,.8)',
+ backdrop : 'rgba(0,0,0,.6)',
+ buttonsStyling : false,
+ confirmButtonText : 'Yes',
+ customClass : {
+ 'confirmButton' : 'btn btn-danger btn-sm text-uppercase',
+ 'cancelButton' : 'ml-2 btn btn-secondary btn-sm text-uppercase',
+ },
+ showCancelButton : true,
+ keydownListenerCapture : true,
+ allowOutsideClick : true,
+ allowEscapeKey : true,
+ didOpen : function() {
+ dataCollection.env.sounds.swalSound.play();
+ }
+ }).then((result) => {
+ if (result.value) {
+ var cancelUrl =
+ dataCollection.env.httpScheme + '://' +
+ dataCollection.env.httpHost + '/' +
+ dataCollection.env.appRoute + '/system/progress/cancelProgress';
+
+ var postData = { };
+ postData[$('#security-token').attr('name')] = $('#security-token').val();
+
+ if (progressFile) {
+ postData['file_name'] = progressFile;
+ }
+
+ $.post(cancelUrl, postData, function(response) {
+ if (response.responseCode == 0) {
+ paginatedPNotify('success', {
+ 'title' : response.responseMessage
+ });
+
+ resetProgressCounter();
+ } else {
+ paginatedPNotify('error', {
+ 'title' : response.responseMessage
+ });
+ }
+ }, 'json');
+ }
+ });
+ }
+ });
+ }
}
function getProgress(options) {
@@ -11994,6 +12059,15 @@ var BazProgress = function() {
responseData = response.responseData;
}
+ if (responseData['pid']) {
+ $('#' + $(element)[0].id + '-cancel').attr('hidden', false);
+ pid = responseData['pid'];
+ }
+
+ if (responseData['progressFile']) {
+ progressFile = responseData['progressFile'];
+ }
+
if (responseData['preCheckComplete'] == false ||
(responseData['callResult'] && responseData['callResult'] === 'reset')
) {
@@ -12029,6 +12103,14 @@ var BazProgress = function() {
$('.' + $(element)[0].id + '-remote-bar').css('width', responseData['percentComplete'] + '%');
$('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', responseData['percentComplete']);
+
+ if ($('.' + $(element)[0].id + '-progress-span').html() === '') {
+ $('.' + $(element)[0].id + '-progress-span')
+ .html(responseData['runners']['running']['text'] + ' (' + responseData['totalPercentComplete'] + '%)');
+
+ $('.' + $(element)[0].id + '-bar').css('width', responseData['totalPercentComplete'] + '%');
+ $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', responseData['totalPercentComplete']);
+ }
} else {
$('.progress-remote, .remote-progress-span').attr('hidden', true);
@@ -12063,6 +12145,14 @@ var BazProgress = function() {
$('.' + $(element)[0].id + '-remote-bar').css('width', responseData['percentComplete'] + '%');
$('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', responseData['percentComplete']);
+
+ if ($('.' + $(element)[0].id + '-progress-span').html() === '') {
+ $('.' + $(element)[0].id + '-progress-span')
+ .html(responseData['runners']['running']['text'] + ' (' + responseData['totalPercentComplete'] + '%)');
+
+ $('.' + $(element)[0].id + '-bar').css('width', responseData['totalPercentComplete'] + '%');
+ $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', responseData['totalPercentComplete']);
+ }
} else {
$('.' + $(element)[0].id + '-remote-bar').css('width', '0%');
$('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', 0);
@@ -12072,10 +12162,10 @@ var BazProgress = function() {
$('.progress-remote, .remote-progress-span').attr('hidden', true);
$('.' + $(element)[0].id + '-progress-span')
- .html(responseData['runners']['running']['text'] + ' (' + responseData['percentComplete'] + '%)');
+ .html(responseData['runners']['running']['text'] + ' (' + responseData['totalPercentComplete'] + '%)');
- $('.' + $(element)[0].id + '-bar').css('width', responseData['percentComplete'] + '%');
- $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', responseData['percentComplete']);
+ $('.' + $(element)[0].id + '-bar').css('width', responseData['totalPercentComplete'] + '%');
+ $('.' + $(element)[0].id + '-bar').attr('aria-valuenow', responseData['totalPercentComplete']);
}
}
} else {
@@ -12132,6 +12222,8 @@ var BazProgress = function() {
isUpload = false;
isDownload = false;
isSteps = false;
+ pid = 0;
+ progressFile = null;
$('.' + $(element)[0].id + '-child-bar').css('width', '0%');
$('.' + $(element)[0].id + '-child-bar').attr('aria-valuenow', 0);
switchProgressBarColor('.' + $(element)[0].id + '-child-bar', 'info');
@@ -12139,6 +12231,7 @@ var BazProgress = function() {
$('.' + $(element)[0].id + '-remote-bar').attr('aria-valuenow', 0);
switchProgressBarColor('.' + $(element)[0].id + '-remote-bar', 'info');
$('.progress-remote, .remote-progress-span').attr('hidden', true);
+ $('#' + $(element)[0].id + '-cancel').attr('hidden', true);
$('body').trigger('bazProgressComplete');
}
} else {
@@ -12237,6 +12330,8 @@ var BazProgress = function() {
isUpload = false;
isDownload = false;
isSteps = false;
+ pid = 0;
+ progressFile = null;
$('body').trigger({'type':'bazProgressComplete', 'reset' : true});
}
@@ -12275,12 +12370,15 @@ var BazProgress = function() {
getProgress(options);
}
}
- BazProgress.buildProgressBar = function(el, mSH = false, child = false, remoteWeb = false) {
- buildProgressBar(el, mSH, child, remoteWeb);
+ BazProgress.buildProgressBar = function(el, mSH = false, child = false, hasSubProcess = false, hasCancelButton = true) {
+ buildProgressBar(el, mSH, child, hasSubProcess, hasCancelButton);
}
BazProgress.switchProgressBarColor = function(el, color) {
switchProgressBarColor(el, color);
}
+ BazProgress.resetProgressCounter = function() {
+ resetProgressCounter();
+ }
BazProgress.setCallable = function(callable) {
setCallable(callable);
}
@@ -12292,4 +12390,4 @@ var BazProgress = function() {
setup(bazProgressConstructor);
return bazProgressConstructor;
-}();
\ No newline at end of file
+}();
diff --git a/system/Base/Exceptions/DuplicateProgressException.php b/system/Base/Exceptions/DuplicateProgressException.php
new file mode 100644
index 000000000..d9e582db5
--- /dev/null
+++ b/system/Base/Exceptions/DuplicateProgressException.php
@@ -0,0 +1,7 @@
+getSchema();
+ $databases = (new Schema)->getSchema($this->postData['dev']);
if (isset($this->postData['databasetype']) && $this->postData['databasetype'] !== 'ff') {
foreach ($databases as $tableName => $tableClass) {
diff --git a/system/Base/Installer/Packages/Setup/Schema.php b/system/Base/Installer/Packages/Setup/Schema.php
index 861281279..12a0b48cd 100644
--- a/system/Base/Installer/Packages/Setup/Schema.php
+++ b/system/Base/Installer/Packages/Setup/Schema.php
@@ -122,245 +122,259 @@
class Schema
{
- public function getSchema()
+ public function getSchema($dev)
{
- return [
- 'service_provider_core' => [
- 'schema' => new Core,
- 'model' => new ServiceProviderCore,
- ],
- 'service_provider_apps' => [
- 'schema' => new Apps,
- 'model' => new ServiceProviderApps,
- ],
- 'service_provider_apps_types' => [
- 'schema' => new Types,
- 'model' => new ServiceProviderAppsTypes,
- ],
- 'service_provider_access_ip_filter' => [
- 'schema' => new IpFilter,
- 'model' => new ServiceProviderAccessIpFilter,
- ],
- 'service_provider_domains' => [
- 'schema' => new Domains,
- 'model' => new ServiceProviderDomains,
- ],
- 'service_provider_modules_queues' => [
- 'schema' => new Queues,
- 'model' => new ServiceProviderModulesQueues,
- ],
- 'modules_bundles' => [
- 'schema' => new Bundles,
- 'model' => new ModulesBundles,
- ],
- 'modules_components' => [
- 'schema' => new Components,
- 'model' => new ModulesComponents,
- ],
- 'modules_packages' => [
- 'schema' => new Packages,
- 'model' => new ModulesPackages,
- ],
- 'modules_middlewares' => [
- 'schema' => new Middlewares,
- 'model' => new ModulesMiddlewares,
- ],
- 'modules_views' => [
- 'schema' => new Views,
- 'model' => new ModulesViews,
- ],
- 'modules_views_settings' => [
- 'schema' => new Settings,
- 'model' => new ModulesViewsSettings,
- ],
- 'modules_externals' => [
- 'schema' => new Externals,
- 'model' => new ModulesExternals,
- ],
- 'basepackages_email_services' => [
- 'schema' => new EmailServices,
- 'model' => new BasepackagesEmailServices,
- ],
- 'basepackages_email_queue' => [
- 'schema' => new EmailQueue,
- 'model' => new BasepackagesEmailQueue,
- ],
- 'basepackages_users_accounts' => [
- 'schema' => new Accounts,
- 'model' => new BasepackagesUsersAccounts,
- ],
- 'basepackages_users_accounts_security' => [
- 'schema' => new Security,
- 'model' => new BasepackagesUsersAccountsSecurity,
- ],
- 'basepackages_users_accounts_canlogin' => [
- 'schema' => new CanLogin,
- 'model' => new BasepackagesUsersAccountsCanlogin,
- ],
- 'basepackages_users_accounts_sessions' => [
- 'schema' => new Sessions,
- 'model' => new BasepackagesUsersAccountsSessions,
- ],
- 'basepackages_users_accounts_identifiers' => [
- 'schema' => new Identifiers,
- 'model' => new BasepackagesUsersAccountsIdentifiers,
- ],
- 'basepackages_users_accounts_agents' => [
- 'schema' => new Agents,
- 'model' => new BasepackagesUsersAccountsAgents,
- ],
- 'basepackages_users_accounts_tunnels' => [
- 'schema' => new Tunnels,
- 'model' => new BasepackagesUsersAccountsTunnels,
- ],
- 'basepackages_users_profiles' => [
- 'schema' => new Profiles,
- 'model' => new BasepackagesUsersProfiles,
- ],
- 'basepackages_users_roles' => [
- 'schema' => new Roles,
- 'model' => new BasepackagesUsersRoles,
- ],
- 'basepackages_menus' => [
- 'schema' => new Menus,
- 'model' => new BasepackagesMenus,
- ],
- 'basepackages_murls' => [
- 'schema' => new Murls,
- 'model' => new BasepackagesMurls,
- ],
- 'basepackages_filters' => [
- 'schema' => new Filters,
- 'model' => new BasepackagesFilters,
- ],
- 'basepackages_geo_countries' => [
- 'schema' => new Countries,
- 'model' => new BasepackagesGeoCountries,
- ],
- 'basepackages_geo_states' => [
- 'schema' => new States,
- 'model' => new BasepackagesGeoStates,
- ],
- 'basepackages_geo_cities' => [
- 'schema' => new Cities,
- 'model' => new BasepackagesGeoCities,
- ],
- 'basepackages_geo_cities_ip2locationv4' => [
- 'schema' => new CitiesIp2LocationV4,
- 'model' => new BasepackagesGeoCitiesIp2locationv4,
- ],
- 'basepackages_geo_cities_ip2locationv6' => [
- 'schema' => new CitiesIp2LocationV6,
- 'model' => new BasepackagesGeoCitiesIp2locationv6,
- ],
- 'basepackages_geo_timezones' => [
- 'schema' => new Timezones,
- 'model' => new BasepackagesGeoTimezones,
- ],
- 'basepackages_address_book' => [
- 'schema' => new AddressBook,
- 'model' => new BasepackagesAddressBook,
- ],
- 'basepackages_storages' => [
- 'schema' => new Storages,
- 'model' => new BasepackagesStorages,
- ],
- 'basepackages_storages_local' => [
- 'schema' => new StoragesLocal,
- 'model' => new BasepackagesStoragesLocal,
- ],
- 'basepackages_activity_logs' => [
- 'schema' => new ActivityLogs,
- 'model' => new BasepackagesActivityLogs,
- ],
- 'basepackages_notes' => [
- 'schema' => new Notes,
- 'model' => new BasepackagesNotes,
- ],
- 'basepackages_notifications' => [
- 'schema' => new Notifications,
- 'model' => new BasepackagesNotifications,
- ],
- 'basepackages_workers_workers' => [
- 'schema' => new Workers,
- 'model' => new BasepackagesWorkersWorkers,
- ],
- 'basepackages_workers_schedules' => [
- 'schema' => new Schedules,
- 'model' => new BasepackagesWorkersSchedules,
- ],
- 'basepackages_workers_tasks' => [
- 'schema' => new Tasks,
- 'model' => new BasepackagesWorkersTasks,
- ],
- 'basepackages_workers_jobs' => [
- 'schema' => new Jobs,
- 'model' => new BasepackagesWorkersJobs,
- ],
- 'basepackages_import_export' => [
- 'schema' => new ImportExport,
- 'model' => new BasepackagesImportExport,
- ],
- 'basepackages_templates' => [
- 'schema' => new Templates,
- 'model' => new BasepackagesTemplates,
- ],
- 'basepackages_dashboards' => [
- 'schema' => new Dashboards,
- 'model' => new BasepackagesDashboards,
- ],
- 'basepackages_dashboards_widgets' => [
- 'schema' => new DashboardsWidgets,
- 'model' => new BasepackagesDashboardsWidgets,
- ],
- 'basepackages_widgets' => [
- 'schema' => new Widgets,
- 'model' => new BasepackagesWidgets,
- ],
- 'basepackages_messenger' => [
- 'schema' => new Messenger,
- 'model' => new BasepackagesMessenger,
- ],
- 'basepackages_api_client_services' => [
- 'schema' => new ApiClientServices,
- 'model' => new BasepackagesApiClientServices,
- ],
- 'basepackages_api_client_services_calls' => [
- 'schema' => new ApiClientServicesCalls,
- 'model' => new BasepackagesApiClientServicesCalls,
- ],
- 'basepackages_api_client_services_apis_repos'=> [
- 'schema' => new Repos,
- 'model' => null
- ],
- 'service_provider_api' => [
- 'schema' => new SPApi,
- 'model' => new ServiceProviderApi,
- ],
- 'service_provider_api_access_tokens' => [
- 'schema' => new AccessTokens,
- 'model' => new ServiceProviderApiAccessTokens,
- ],
- 'service_provider_api_authorization_codes' => [
- 'schema' => new AuthorizationCodes,
- 'model' => new ServiceProviderApiAuthorizationCodes,
- ],
- 'service_provider_api_clients' => [
- 'schema' => new Clients,
- 'model' => new ServiceProviderApiClients,
- ],
- 'service_provider_api_refresh_tokens' => [
- 'schema' => new RefreshTokens,
- 'model' => new ServiceProviderApiRefreshTokens,
- ],
- 'service_provider_api_scopes' => [
- 'schema' => new Scopes,
- 'model' => new ServiceProviderApiScopes,
- ],
- 'service_provider_api_scopes' => [
- 'schema' => new Scopes,
- 'model' => new ServiceProviderApiScopes,
- ]
- ];
+ $schema =
+ [
+ 'service_provider_core' => [
+ 'schema' => new Core,
+ 'model' => new ServiceProviderCore,
+ ],
+ 'service_provider_apps' => [
+ 'schema' => new Apps,
+ 'model' => new ServiceProviderApps,
+ ],
+ 'service_provider_apps_types' => [
+ 'schema' => new Types,
+ 'model' => new ServiceProviderAppsTypes,
+ ],
+ 'service_provider_access_ip_filter' => [
+ 'schema' => new IpFilter,
+ 'model' => new ServiceProviderAccessIpFilter,
+ ],
+ 'service_provider_domains' => [
+ 'schema' => new Domains,
+ 'model' => new ServiceProviderDomains,
+ ],
+ 'service_provider_modules_queues' => [
+ 'schema' => new Queues,
+ 'model' => new ServiceProviderModulesQueues,
+ ],
+ 'modules_bundles' => [
+ 'schema' => new Bundles,
+ 'model' => new ModulesBundles,
+ ],
+ 'modules_components' => [
+ 'schema' => new Components,
+ 'model' => new ModulesComponents,
+ ],
+ 'modules_packages' => [
+ 'schema' => new Packages,
+ 'model' => new ModulesPackages,
+ ],
+ 'modules_middlewares' => [
+ 'schema' => new Middlewares,
+ 'model' => new ModulesMiddlewares,
+ ],
+ 'modules_views' => [
+ 'schema' => new Views,
+ 'model' => new ModulesViews,
+ ],
+ 'modules_views_settings' => [
+ 'schema' => new Settings,
+ 'model' => new ModulesViewsSettings,
+ ],
+ 'modules_externals' => [
+ 'schema' => new Externals,
+ 'model' => new ModulesExternals,
+ ],
+ 'basepackages_email_services' => [
+ 'schema' => new EmailServices,
+ 'model' => new BasepackagesEmailServices,
+ ],
+ 'basepackages_email_queue' => [
+ 'schema' => new EmailQueue,
+ 'model' => new BasepackagesEmailQueue,
+ ],
+ 'basepackages_users_accounts' => [
+ 'schema' => new Accounts,
+ 'model' => new BasepackagesUsersAccounts,
+ ],
+ 'basepackages_users_accounts_security' => [
+ 'schema' => new Security,
+ 'model' => new BasepackagesUsersAccountsSecurity,
+ ],
+ 'basepackages_users_accounts_canlogin' => [
+ 'schema' => new CanLogin,
+ 'model' => new BasepackagesUsersAccountsCanlogin,
+ ],
+ 'basepackages_users_accounts_sessions' => [
+ 'schema' => new Sessions,
+ 'model' => new BasepackagesUsersAccountsSessions,
+ ],
+ 'basepackages_users_accounts_identifiers' => [
+ 'schema' => new Identifiers,
+ 'model' => new BasepackagesUsersAccountsIdentifiers,
+ ],
+ 'basepackages_users_accounts_agents' => [
+ 'schema' => new Agents,
+ 'model' => new BasepackagesUsersAccountsAgents,
+ ],
+ 'basepackages_users_accounts_tunnels' => [
+ 'schema' => new Tunnels,
+ 'model' => new BasepackagesUsersAccountsTunnels,
+ ],
+ 'basepackages_users_profiles' => [
+ 'schema' => new Profiles,
+ 'model' => new BasepackagesUsersProfiles,
+ ],
+ 'basepackages_users_roles' => [
+ 'schema' => new Roles,
+ 'model' => new BasepackagesUsersRoles,
+ ],
+ 'basepackages_menus' => [
+ 'schema' => new Menus,
+ 'model' => new BasepackagesMenus,
+ ],
+ 'basepackages_murls' => [
+ 'schema' => new Murls,
+ 'model' => new BasepackagesMurls,
+ ],
+ 'basepackages_filters' => [
+ 'schema' => new Filters,
+ 'model' => new BasepackagesFilters,
+ ],
+ 'basepackages_geo_countries' => [
+ 'schema' => new Countries,
+ 'model' => new BasepackagesGeoCountries,
+ ],
+ 'basepackages_geo_states' => [
+ 'schema' => new States,
+ 'model' => new BasepackagesGeoStates,
+ ],
+ 'basepackages_geo_cities' => [
+ 'schema' => new Cities,
+ 'model' => new BasepackagesGeoCities,
+ ],
+ 'basepackages_geo_cities_ip2locationv4' => [
+ 'schema' => new CitiesIp2LocationV4,
+ 'model' => new BasepackagesGeoCitiesIp2locationv4,
+ ],
+ 'basepackages_geo_cities_ip2locationv6' => [
+ 'schema' => new CitiesIp2LocationV6,
+ 'model' => new BasepackagesGeoCitiesIp2locationv6,
+ ],
+ 'basepackages_geo_timezones' => [
+ 'schema' => new Timezones,
+ 'model' => new BasepackagesGeoTimezones,
+ ],
+ 'basepackages_address_book' => [
+ 'schema' => new AddressBook,
+ 'model' => new BasepackagesAddressBook,
+ ],
+ 'basepackages_storages' => [
+ 'schema' => new Storages,
+ 'model' => new BasepackagesStorages,
+ ],
+ 'basepackages_storages_local' => [
+ 'schema' => new StoragesLocal,
+ 'model' => new BasepackagesStoragesLocal,
+ ],
+ 'basepackages_activity_logs' => [
+ 'schema' => new ActivityLogs,
+ 'model' => new BasepackagesActivityLogs,
+ ],
+ 'basepackages_notes' => [
+ 'schema' => new Notes,
+ 'model' => new BasepackagesNotes,
+ ],
+ 'basepackages_notifications' => [
+ 'schema' => new Notifications,
+ 'model' => new BasepackagesNotifications,
+ ],
+ 'basepackages_workers_workers' => [
+ 'schema' => new Workers,
+ 'model' => new BasepackagesWorkersWorkers,
+ ],
+ 'basepackages_workers_schedules' => [
+ 'schema' => new Schedules,
+ 'model' => new BasepackagesWorkersSchedules,
+ ],
+ 'basepackages_workers_tasks' => [
+ 'schema' => new Tasks,
+ 'model' => new BasepackagesWorkersTasks,
+ ],
+ 'basepackages_workers_jobs' => [
+ 'schema' => new Jobs,
+ 'model' => new BasepackagesWorkersJobs,
+ ],
+ 'basepackages_import_export' => [
+ 'schema' => new ImportExport,
+ 'model' => new BasepackagesImportExport,
+ ],
+ 'basepackages_templates' => [
+ 'schema' => new Templates,
+ 'model' => new BasepackagesTemplates,
+ ],
+ 'basepackages_dashboards' => [
+ 'schema' => new Dashboards,
+ 'model' => new BasepackagesDashboards,
+ ],
+ 'basepackages_dashboards_widgets' => [
+ 'schema' => new DashboardsWidgets,
+ 'model' => new BasepackagesDashboardsWidgets,
+ ],
+ 'basepackages_widgets' => [
+ 'schema' => new Widgets,
+ 'model' => new BasepackagesWidgets,
+ ],
+ 'basepackages_messenger' => [
+ 'schema' => new Messenger,
+ 'model' => new BasepackagesMessenger,
+ ],
+ 'basepackages_api_client_services' => [
+ 'schema' => new ApiClientServices,
+ 'model' => new BasepackagesApiClientServices,
+ ],
+ 'basepackages_api_client_services_calls' => [
+ 'schema' => new ApiClientServicesCalls,
+ 'model' => new BasepackagesApiClientServicesCalls,
+ ],
+ 'basepackages_api_client_services_apis_repos'=> [
+ 'schema' => new Repos,
+ 'model' => null
+ ],
+ 'service_provider_api' => [
+ 'schema' => new SPApi,
+ 'model' => new ServiceProviderApi,
+ ],
+ 'service_provider_api_access_tokens' => [
+ 'schema' => new AccessTokens,
+ 'model' => new ServiceProviderApiAccessTokens,
+ ],
+ 'service_provider_api_authorization_codes' => [
+ 'schema' => new AuthorizationCodes,
+ 'model' => new ServiceProviderApiAuthorizationCodes,
+ ],
+ 'service_provider_api_clients' => [
+ 'schema' => new Clients,
+ 'model' => new ServiceProviderApiClients,
+ ],
+ 'service_provider_api_refresh_tokens' => [
+ 'schema' => new RefreshTokens,
+ 'model' => new ServiceProviderApiRefreshTokens,
+ ],
+ 'service_provider_api_scopes' => [
+ 'schema' => new Scopes,
+ 'model' => new ServiceProviderApiScopes,
+ ],
+ 'service_provider_api_scopes' => [
+ 'schema' => new Scopes,
+ 'model' => new ServiceProviderApiScopes,
+ ]
+ ];
+
+ if ($dev == true) {
+ $schema['apps_core_devtools_files_hash'] = [
+ 'schema' => new \Apps\Core\Packages\Devtools\Modules\Install\Schema\FilesHash,
+ 'model' => new \Apps\Core\Packages\Devtools\Modules\Model\AppsCoreDevtoolsFilesHash,
+ ];
+ $schema['devtools_test'] = [
+ 'schema' => new \Apps\Core\Packages\Devtools\Test\Install\Schema\DevtoolsTest,
+ 'model' => new \Apps\Core\Packages\Devtools\Test\Model\DevtoolsTest,
+ ];
+ }
+
+ return $schema;
}
}
\ No newline at end of file
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Bundles.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Bundles.php
index e015ad5d4..79e1aaade 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Modules/Bundles.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Bundles.php
@@ -25,7 +25,7 @@ public function columns()
'name',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Components.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Components.php
index 6f891b8b0..3ffd09f43 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Modules/Components.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Components.php
@@ -25,7 +25,7 @@ public function columns()
'name',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
@@ -33,7 +33,7 @@ public function columns()
'route',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
@@ -65,7 +65,7 @@ public function columns()
'category',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Externals.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Externals.php
index 047432e72..df1756c5d 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Modules/Externals.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Externals.php
@@ -33,7 +33,7 @@ public function columns()
'name',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
@@ -41,7 +41,7 @@ public function columns()
'display_name',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 255,
'notNull' => true,
]
),
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Middlewares.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Middlewares.php
index 435c3be6f..833869eb0 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Modules/Middlewares.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Middlewares.php
@@ -25,7 +25,7 @@ public function columns()
'name',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
@@ -33,7 +33,7 @@ public function columns()
'display_name',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 255,
'notNull' => true,
]
),
@@ -65,7 +65,7 @@ public function columns()
'category',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Packages.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Packages.php
index 66b7a9d8d..066c4fb98 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Modules/Packages.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Packages.php
@@ -25,7 +25,7 @@ public function columns()
'name',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
@@ -33,7 +33,7 @@ public function columns()
'display_name',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 255,
'notNull' => true,
]
),
@@ -65,7 +65,7 @@ public function columns()
'category',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
diff --git a/system/Base/Installer/Packages/Setup/Schema/Modules/Views.php b/system/Base/Installer/Packages/Setup/Schema/Modules/Views.php
index 80334687c..a76d70189 100644
--- a/system/Base/Installer/Packages/Setup/Schema/Modules/Views.php
+++ b/system/Base/Installer/Packages/Setup/Schema/Modules/Views.php
@@ -25,7 +25,7 @@ public function columns()
'name',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
@@ -33,7 +33,7 @@ public function columns()
'display_name',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 255,
'notNull' => true,
]
),
@@ -65,7 +65,7 @@ public function columns()
'category',
[
'type' => Column::TYPE_VARCHAR,
- 'size' => 50,
+ 'size' => 100,
'notNull' => true,
]
),
diff --git a/system/Base/Installer/View/setup.phtml b/system/Base/Installer/View/setup.phtml
index 05a3218fb..fedf2965c 100644
--- a/system/Base/Installer/View/setup.phtml
+++ b/system/Base/Installer/View/setup.phtml
@@ -44,7 +44,7 @@
-
+
diff --git a/system/Base/Providers/AccessServiceProvider/Access/Auth.php b/system/Base/Providers/AccessServiceProvider/Access/Auth.php
index e60021fca..d0fb3763b 100644
--- a/system/Base/Providers/AccessServiceProvider/Access/Auth.php
+++ b/system/Base/Providers/AccessServiceProvider/Access/Auth.php
@@ -82,7 +82,16 @@ public function attempt($data)
if (str_contains(strtolower($validate), 'please contact administrator')) {
$validate = str_replace('Error! Please contact administrator.', '', $validate);
}
- $this->addResponse($validate, 3, ['allowed_methods' => $this->core->core['settings']['security']['twofaSettings']['twofaUsing']]);
+
+ if ($this->account['security']['twofa_otp_status'] == true) {
+ $this->addResponse($validate, 3, ['allowed_methods' => $this->core->core['settings']['security']['twofaSettings']['twofaUsing']]);
+ } else {//redirect to setup twofa
+ $this->addResponse('2FA needed, but not set. Redirecting...');
+
+ $this->packagesData->redirectUrl = $this->links->url('auth/q/setup2fa/true');
+
+ return true;
+ }
} else {
$this->addResponse($validate, 1);
}
@@ -94,7 +103,10 @@ public function attempt($data)
$security = $this->getAccountSecurityObject();
- if (isset($this->app['enforce_2fa']) && $this->app['enforce_2fa'] == '1') {
+ if ($this->core->core['settings']['security']['twofa'] == 'true' &&
+ isset($this->app['enforce_2fa']) &&
+ $this->app['enforce_2fa'] == '1'
+ ) {
if (!$this->twoFa->validateTwoFaCode($security, $data)) {
$this->addResponse(
$this->twoFa->packagesData->responseMessage,
@@ -749,7 +761,10 @@ public function validateData(array $data, $task)
$this->validation->add('user', PresenceOf::class, ["message" => "Enter valid user name."]);
$this->validation->add('pass', PresenceOf::class, ["message" => "Enter valid password."]);
if ($task === 'auth2fa') {
- if (isset($this->app['enforce_2fa']) && $this->app['enforce_2fa'] == '1') {
+ if ($this->core->core['settings']['security']['twofa'] == 'true' &&
+ isset($this->app['enforce_2fa']) &&
+ $this->app['enforce_2fa'] == '1'
+ ) {
$this->validation->add('twofa_using', PresenceOf::class, ["message" => "Error! Please contact administrator."]);
$this->validation->add('code', PresenceOf::class, ["message" => "Enter valid 2FA code"]);
if (isset($data['twofa_using'])) {
diff --git a/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php b/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php
index d2eeb6703..2cd7b9e6e 100644
--- a/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php
+++ b/system/Base/Providers/BasepackagesServiceProvider/Packages/Progress.php
@@ -8,6 +8,7 @@
use League\Flysystem\UnableToWriteFile;
use Mattiasgeniar\Percentage\Percentage;
use System\Base\BasePackage;
+use System\Base\Exceptions\DuplicateProgressException;
class Progress extends BasePackage
{
@@ -44,8 +45,9 @@ public function checkProgressFile($fileName = null)
$this->progressFileName = $fileName;
}
- if ($this->readProgressFile()) {
- return true;
+ $progressFile = $this->readProgressFile();
+ if ($progressFile) {
+ return $progressFile;
}
return false;
@@ -69,6 +71,8 @@ public function registerMethods(array $methods)
$progressFile = $this->readProgressFile();
+ $this->checkProcessIsRunning($progressFile);
+
if ($progressFile && isset($progressFile['processes']) && count($progressFile['processes']) > 0) {
foreach ($methods as $method) {
array_push($progressFile['processes'], $method);
@@ -132,11 +136,12 @@ public function getProgress($session = null, $returnArray = false)
$progress =
[
- 'total' => $progressFile['total'],
- 'completed' => $progressFile['completed'],
- 'preCheckComplete' => $progressFile['preCheckComplete'],
- 'percentComplete' => $this->getPercentComplete($progressFile),
- 'runners' => $progressFile['runners'] ?? false
+ 'total' => $progressFile['total'],
+ 'completed' => $progressFile['completed'],
+ 'preCheckComplete' => $progressFile['preCheckComplete'],
+ 'totalPercentComplete' => $this->getPercentComplete($progressFile, false),
+ 'percentComplete' => $this->getPercentComplete($progressFile),
+ 'runners' => $progressFile['runners'] ?? false
];
if ($returnArray) {
@@ -170,6 +175,13 @@ public function updateProgress($method, $callResult = null, $deleteFile = true,
$progressFile = $this->readProgressFile();
if (isset($progressFile['processes']) && count($progressFile['processes']) > 0) {
+ if ($progressFile['allProcesses'][0]['method'] === $method &&
+ !$callResult &&
+ $progressFile['completed'] === 0
+ ) {
+ $this->checkProcessIsRunning($progressFile);
+ }
+
$runners = [];
foreach ($progressFile['processes'] as $progressFileKey => $progressFileMethod) {
@@ -250,6 +262,32 @@ public function updateProgress($method, $callResult = null, $deleteFile = true,
return false;
}
+ public function checkProcessIsRunning($progressFile = null)
+ {
+ if (!$progressFile) {
+ $progressFile = $this->checkProgressFile();
+ }
+
+ //Check if process is already running
+ //If a user tries to reinitiate same process from start, we should return an error.
+ if ($progressFile &&
+ ($progressFile['runners']['running'] !== false) &&
+ $progressFile['pid'] > 0
+ ) {
+ if (isset($progressFile['pid']) && $progressFile['pid'] > 0) {
+ exec('ps -aux | grep ' . $progressFile['pid'], $output, $result);
+
+ if ($result === 0 &&
+ count($output) > 0
+ ) {
+ if (str_contains($output[0], 'php')) {
+ throw new DuplicateProgressException('Process is already running with process ID: ' . $progressFile['pid']);
+ }
+ }
+ }
+ }
+ }
+
protected function checkNotificationTunnel()
{
if (!$this->notificationsTunnel && isset($this->apps)) {
@@ -295,12 +333,15 @@ protected function sendNotification($callResult, $counters = null)
'responseMessage' => 'Ok',
'responseData' =>
[
- 'total' => $progressFile['total'],
- 'completed' => $progressFile['completed'],
- 'preCheckComplete' => $progressFile['preCheckComplete'],
- 'percentComplete' => $this->getPercentComplete($progressFile),
- 'runners' => $progressFile['runners'] ?? false,
- 'callResult' => $callResult
+ 'progressFile' => $this->progressFileName,
+ 'pid' => $progressFile['pid'] ?? false,
+ 'total' => $progressFile['total'],
+ 'completed' => $progressFile['completed'],
+ 'preCheckComplete' => $progressFile['preCheckComplete'],
+ 'totalPercentComplete' => $this->getPercentComplete($progressFile, false),
+ 'percentComplete' => $this->getPercentComplete($progressFile),
+ 'runners' => $progressFile['runners'] ?? false,
+ 'callResult' => $callResult
]
]
]
@@ -309,31 +350,33 @@ protected function sendNotification($callResult, $counters = null)
}
}
- protected function getPercentComplete($progressFile)
+ protected function getPercentComplete($progressFile, $counters = true)
{
$percentComplete = (float) number_format(($progressFile['completed'] * 100) / $progressFile['total']);
- if (isset($progressFile['runners']['running']['remoteWebCounters'])) {
- $webProgress = 0;
+ if ($counters) {
+ if (isset($progressFile['runners']['running']['remoteWebCounters'])) {
+ $webProgress = 0;
- if (isset($progressFile['runners']['running']['remoteWebCounters']['downloadTotal']) && $progressFile['runners']['running']['remoteWebCounters']['downloadTotal'] > 0) {
- $webProgress = Percentage::calculate($progressFile['runners']['running']['remoteWebCounters']['downloadedBytes'], $progressFile['runners']['running']['remoteWebCounters']['downloadTotal']);
- } else if (isset($progressFile['runners']['running']['remoteWebCounters']['uploadTotal']) && $progressFile['runners']['running']['remoteWebCounters']['uploadTotal'] > 0) {
- $webProgress = Percentage::calculate($progressFile['runners']['running']['remoteWebCounters']['uploadedBytes'], $progressFile['runners']['running']['remoteWebCounters']['uploadTotal']);
- }
+ if (isset($progressFile['runners']['running']['remoteWebCounters']['downloadTotal']) && $progressFile['runners']['running']['remoteWebCounters']['downloadTotal'] > 0) {
+ $webProgress = Percentage::calculate($progressFile['runners']['running']['remoteWebCounters']['downloadedBytes'], $progressFile['runners']['running']['remoteWebCounters']['downloadTotal']);
+ } else if (isset($progressFile['runners']['running']['remoteWebCounters']['uploadTotal']) && $progressFile['runners']['running']['remoteWebCounters']['uploadTotal'] > 0) {
+ $webProgress = Percentage::calculate($progressFile['runners']['running']['remoteWebCounters']['uploadedBytes'], $progressFile['runners']['running']['remoteWebCounters']['uploadTotal']);
+ }
- if ($webProgress > -1) {
- $percentComplete = (float) number_format($webProgress);
- }
- } else if (isset($progressFile['runners']['running']['stepsCounters'])) {
- $stepsProgress = 0;
+ if ($webProgress > -1) {
+ $percentComplete = (float) number_format($webProgress);
+ }
+ } else if (isset($progressFile['runners']['running']['stepsCounters'])) {
+ $stepsProgress = 0;
- if (isset($progressFile['runners']['running']['stepsCounters']['stepsTotal']) && $progressFile['runners']['running']['stepsCounters']['stepsTotal'] > 0) {
- $stepsProgress = Percentage::calculate($progressFile['runners']['running']['stepsCounters']['stepsCurrent'], $progressFile['runners']['running']['stepsCounters']['stepsTotal']);
- }
+ if (isset($progressFile['runners']['running']['stepsCounters']['stepsTotal']) && $progressFile['runners']['running']['stepsCounters']['stepsTotal'] > 0) {
+ $stepsProgress = Percentage::calculate($progressFile['runners']['running']['stepsCounters']['stepsCurrent'], $progressFile['runners']['running']['stepsCounters']['stepsTotal']);
+ }
- if ($stepsProgress > -1) {
- $percentComplete = (float) number_format($stepsProgress);
+ if ($stepsProgress > -1) {
+ $percentComplete = (float) number_format($stepsProgress);
+ }
}
}
@@ -379,6 +422,49 @@ protected function checkProgressPath()
return true;
}
+ public function cancelProgress($fileName = null)
+ {
+ $progressFile = $this->checkProgressFile($fileName);
+
+ if ($progressFile) {
+ if (isset($progressFile['pid']) && $progressFile['pid'] > 0) {
+ exec('ps -aux | grep ' . $progressFile['pid'], $output, $result);
+
+ if ($result === 0 &&
+ count($output) > 0
+ ) {
+ if (str_contains($output[0], 'php')) {
+ exec('kill -9 ' . $progressFile['pid'], $output, $result);
+
+ if ($result !== 0) {
+ $this->addResponse('Error terminating process', 1, ['output' => $output]);
+
+ return false;
+ }
+
+ $this->writeProgressFile(methods: [],progressFile: $progressFile);
+
+ $this->addResponse('Successfully terminating process');
+
+ return $this->resetProgress();
+ }
+ }
+ }
+
+ $progressFile['runners']['running'] = false;
+ $progressFile['runners']['next'] = false;
+ $this->writeProgressFile(methods: [], progressFile: $progressFile, register: true);
+
+ $this->addResponse('Process not running', 1);
+
+ return false;
+ } else {
+ $this->addResponse('Error loading progressfile!', 1);
+
+ return false;
+ }
+ }
+
protected function readProgressFile($session = null)
{
if (!$this->progressFileName) {
@@ -496,6 +582,14 @@ protected function writeProgressFile(
$file['notifications_tunnel'] = $this->notificationsTunnel;
+ if ($register) {
+ $file['pid'] = 0;
+ }
+
+ if (!isset($file['pid'])) {
+ $file['pid'] = getmypid();
+ }
+
if ($this->opCache) {
if ($progressFile) {
$this->opCache->resetCache($this->progressFileName, $file, 'progress');
@@ -513,6 +607,8 @@ protected function writeProgressFile(
public function deleteProgressFile()
{
+ $this->checkProcessIsRunning();
+
if (!$this->progressFileName) {
$this->progressFileName = $this->session->getId();
}
diff --git a/system/Base/Providers/CoreServiceProvider/Install/Install.php b/system/Base/Providers/CoreServiceProvider/Install/Install.php
index 29a458661..4c9cf2c5e 100644
--- a/system/Base/Providers/CoreServiceProvider/Install/Install.php
+++ b/system/Base/Providers/CoreServiceProvider/Install/Install.php
@@ -14,7 +14,7 @@ class Install extends BasePackage
public function init($schemaNames = [])
{
- $databases = (new Schema)->getSchema();
+ $databases = (new Schema)->getSchema($this->core->core['settings']['dev']);
$this->databases = $databases;
diff --git a/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php b/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php
index fb4a7643e..8a02c3425 100644
--- a/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php
+++ b/system/Base/Providers/DatabaseServiceProvider/Ff/Store.php
@@ -133,6 +133,7 @@ public function getSchemaMetaData($relations = false)
if (count($relation) > 0 && isset($relation[2])) {
try {
+ $relation[2] = explode('+', $relation[2])[0];
$relationsStore = new Store($relation[2], $this->databasePath, $this->ff);
$rmd = array_replace_recursive($rmd, $relationsStore->getSchemaMetaData());
@@ -1713,6 +1714,10 @@ protected function decreaseCounter()
protected function updateCounters($counters)
{
+ if ($counters['totalEntries'] === 0) {
+ $counters['lastId'] = 0;
+ }
+
$updateCounters = IoHelper::updateFileContent(
$this->storePath . '_cnt.sdb',
function () use ($counters) {
diff --git a/system/Base/Providers/DispatcherServiceProvider/Dispatcher.php b/system/Base/Providers/DispatcherServiceProvider/Dispatcher.php
index 759817c53..d8f4893e2 100644
--- a/system/Base/Providers/DispatcherServiceProvider/Dispatcher.php
+++ b/system/Base/Providers/DispatcherServiceProvider/Dispatcher.php
@@ -76,6 +76,10 @@ function (
$dispatcher->getDi()->getShared('logger')->logExceptions->critical(json_trace($exception));
}
+ if ($dispatcher->getDi()->getShared('request')->isPost()) {
+ throw $exception;
+ }
+
if (!str_contains($exception->getMessage(), 'handler class cannot be loaded')) {//Handle any other exceptions, like variable not found, etc
$class = (new \ReflectionClass($exception))->getShortName();
diff --git a/system/Base/Providers/ErrorServiceProvider/Error.php b/system/Base/Providers/ErrorServiceProvider/Error.php
index e8a56b2b1..f5fba2b38 100644
--- a/system/Base/Providers/ErrorServiceProvider/Error.php
+++ b/system/Base/Providers/ErrorServiceProvider/Error.php
@@ -93,6 +93,10 @@ public function handle(\throwable $exception)
$customHandler = $this->customHandler();
+ if ($this->logger) {
+ $this->logger->commit();
+ }
+
if (!$customHandler) {
if ($this->appDebug) {
$this->showOnScreen();
diff --git a/system/Base/Providers/ErrorServiceProvider/ExceptionHandlers.php b/system/Base/Providers/ErrorServiceProvider/ExceptionHandlers.php
index 5ae5ac452..863c97aef 100644
--- a/system/Base/Providers/ErrorServiceProvider/ExceptionHandlers.php
+++ b/system/Base/Providers/ErrorServiceProvider/ExceptionHandlers.php
@@ -95,6 +95,13 @@ public function handleIOException($exception)
return $this->sendJson();
}
+ public function handleDuplicateProgressException($exception)
+ {
+ $this->addResponse($exception->getMessage(), 1);
+
+ return $this->sendJson();
+ }
+
private function setViewsDir($partial)
{
$this->view->setViewsDir(base_path($this->baseErrorDir));
diff --git a/system/Base/Providers/MiddlewaresServiceProvider.php b/system/Base/Providers/MiddlewaresServiceProvider.php
index e271d62c4..ec2bef74e 100644
--- a/system/Base/Providers/MiddlewaresServiceProvider.php
+++ b/system/Base/Providers/MiddlewaresServiceProvider.php
@@ -158,8 +158,8 @@ protected function checkRoute($middleware)
$this->data['appRoute'] . '/auth/pwreset',
$this->data['appRoute'] . '/auth/checkpwstrength',
$this->data['appRoute'] . '/auth/generatepw',
- $this->data['appRoute'] . '/auth/enabletwofatotp',
- $this->data['appRoute'] . '/auth/verifytwofatotp',
+ $this->data['appRoute'] . '/auth/enabletwofaotp',
+ $this->data['appRoute'] . '/auth/verifytwofaotp',
$this->data['appRoute'] . '/auth/logout',
$this->data['appRoute'] . '/auth/sendverification',
$this->data['appRoute'] . '/auth/verify',
diff --git a/system/Base/Providers/ModulesServiceProvider/Settings.php b/system/Base/Providers/ModulesServiceProvider/Settings.php
index d442eb7a6..b263a0b36 100644
--- a/system/Base/Providers/ModulesServiceProvider/Settings.php
+++ b/system/Base/Providers/ModulesServiceProvider/Settings.php
@@ -25,7 +25,7 @@ public function afterUpdate($packageClass, $package, $data)
$package['settings'] = $this->helper->decode($package['settings'], true);
}
- $apiClientServices = $this->basepackages->apiClientServices->getAll(true)->apiClientServices;
+ $apiClientServices = $this->basepackages->apiClientServices->getApiByAppType();
if (count($package['settings']['api_clients']) > 0) {
foreach ($apiClientServices as $api) {