JcDenis
/
improve
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

fix unknow preferences on new install, thanks @Gvx-, closes #6

master
Jean-Christian Paul Denis 2021-11-15 22:29:13 +01:00
parent 60018a94bf
commit 3776b5d1b8
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
index.php
View File

@ -88,18 +88,21 @@ class index
{ {
try { try {
if (!empty($this->type)) { if (!empty($this->type)) {
$preferences = unserialize($this->core->blog->settings->improve->preferences); $preferences = $this->core->blog->settings->improve->preferences;
if (is_string($preferences)) {
$preferences = unserialize($preferences);
if (is_array($preferences)) { if (is_array($preferences)) {
return array_key_exists($this->type, $preferences) ? $preferences[$this->type] : []; return array_key_exists($this->type, $preferences) ? $preferences[$this->type] : [];
} }
} }
}
} catch (Exception $e) { } catch (Exception $e) {
} }
return []; return [];
} }
private function setPreferences(): void private function setPreferences(): bool
{ {
if (!empty($_POST['save_preferences'])) { if (!empty($_POST['save_preferences'])) {
$preferences[$this->type] = []; $preferences[$this->type] = [];
@ -112,7 +115,11 @@ class index
} }
$this->core->blog->settings->improve->put('preferences', serialize($preferences), 'string', null, true, true); $this->core->blog->settings->improve->put('preferences', serialize($preferences), 'string', null, true, true);
dcPage::addSuccessNotice(__('Configuration successfully updated')); dcPage::addSuccessNotice(__('Configuration successfully updated'));
return true;
} }
return false;
} }
private function comboModules(): array private function comboModules(): array
@ -143,6 +150,8 @@ class index
private function doAction(): void private function doAction(): void
{ {
$done = $this->setPreferences();
if (!empty($_POST['fix'])) { if (!empty($_POST['fix'])) {
if (empty($_POST['actions'])) { if (empty($_POST['actions'])) {
dcPage::addWarningNotice(__('No action selected')); dcPage::addWarningNotice(__('No action selected'));
@ -170,12 +179,17 @@ class index
} }
dcPage::addNotice($notice['type'], sprintf($notice['msg'], $this->module, $time)); dcPage::addNotice($notice['type'], sprintf($notice['msg'], $this->module, $time));
$this->core->adminurl->redirect('admin.plugin.improve', ['type' => $this->type, 'module' => $this->module, 'upd' => $log_id]); $done = true;
} catch (Exception $e) { } catch (Exception $e) {
$this->core->error->add($e->getMessage()); $this->core->error->add($e->getMessage());
$done = false;
} }
} }
} }
if ($done) {
$this->core->adminurl->redirect('admin.plugin.improve', ['type' => $this->type, 'module' => $this->module, 'upd' => $log_id]);
}
} }
private function displayPage(): void private function displayPage(): void