use json rather than serialize. use short settings names
parent
0b441cc164
commit
4c04ec2ca1
26
_install.php
26
_install.php
|
@ -15,7 +15,7 @@ if (!defined('DC_CONTEXT_ADMIN')) {
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
# Version
|
// Version
|
||||||
if (!dcCore::app()->newVersion(
|
if (!dcCore::app()->newVersion(
|
||||||
basename(__DIR__),
|
basename(__DIR__),
|
||||||
dcCore::app()->plugins->moduleInfo(basename(__DIR__), 'version')
|
dcCore::app()->plugins->moduleInfo(basename(__DIR__), 'version')
|
||||||
|
@ -23,7 +23,10 @@ try {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Database
|
// Uppgrade
|
||||||
|
epcUpgrade::preUpgrade();
|
||||||
|
|
||||||
|
// Database
|
||||||
$s = new dbStruct(dcCore::app()->con, dcCore::app()->prefix);
|
$s = new dbStruct(dcCore::app()->con, dcCore::app()->prefix);
|
||||||
$s->{initEnhancePostContent::TABLE_NAME}
|
$s->{initEnhancePostContent::TABLE_NAME}
|
||||||
->epc_id('bigint', 0, false)
|
->epc_id('bigint', 0, false)
|
||||||
|
@ -44,7 +47,7 @@ try {
|
||||||
$changes = $si->synchronize($s);
|
$changes = $si->synchronize($s);
|
||||||
$s = null;
|
$s = null;
|
||||||
|
|
||||||
# Settings
|
// Settings
|
||||||
dcCore::app()->blog->settings->addNamespace(basename(__DIR__));
|
dcCore::app()->blog->settings->addNamespace(basename(__DIR__));
|
||||||
$s = dcCore::app()->blog->settings->__get(basename(__DIR__));
|
$s = dcCore::app()->blog->settings->__get(basename(__DIR__));
|
||||||
|
|
||||||
|
@ -52,13 +55,13 @@ try {
|
||||||
$s->put('list_sortby', 'epc_key', 'string', 'Admin records list field order', false, true);
|
$s->put('list_sortby', 'epc_key', 'string', 'Admin records list field order', false, true);
|
||||||
$s->put('list_order', 'desc', 'string', 'Admin records list order', false, true);
|
$s->put('list_order', 'desc', 'string', 'Admin records list order', false, true);
|
||||||
$s->put('list_nb', 20, 'integer', 'Admin records list nb per page', false, true);
|
$s->put('list_nb', 20, 'integer', 'Admin records list nb per page', false, true);
|
||||||
$s->put('allowedtplvalues', serialize(enhancePostContent::defaultAllowedTplValues()), 'string', 'List of allowed template values', false, true);
|
$s->put('allowedtplvalues', json_encode(enhancePostContent::defaultAllowedTplValues()), 'string', 'List of allowed template values', false, true);
|
||||||
$s->put('allowedpubpages', serialize(enhancePostContent::defaultAllowedPubPages()), 'string', 'List of allowed template pages', false, true);
|
$s->put('allowedpubpages', json_encode(enhancePostContent::defaultAllowedPubPages()), 'string', 'List of allowed template pages', false, true);
|
||||||
|
|
||||||
# Filters settings
|
// Filters settings
|
||||||
$filters = enhancePostContent::getFilters();
|
$filters = enhancePostContent::getFilters();
|
||||||
foreach ($filters as $id => $filter) {
|
foreach ($filters as $id => $filter) {
|
||||||
# Only editable options
|
// Only editable options
|
||||||
$opt = [
|
$opt = [
|
||||||
'nocase' => $filter->nocase,
|
'nocase' => $filter->nocase,
|
||||||
'plural' => $filter->plural,
|
'plural' => $filter->plural,
|
||||||
|
@ -67,14 +70,11 @@ try {
|
||||||
'tplValues' => $filter->tplValues,
|
'tplValues' => $filter->tplValues,
|
||||||
'pubPages' => $filter->pubPages,
|
'pubPages' => $filter->pubPages,
|
||||||
];
|
];
|
||||||
$s->put($id, serialize($opt), 'string', 'Settings for ' . $id, false, true);
|
$s->put($id, json_encode($opt), 'string', 'Settings for ' . $id, false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
# Update old versions
|
// Upgrade
|
||||||
$old_version = dcCore::app()->getVersion(basename(__DIR__));
|
epcUpgrade::postUpgrade();
|
||||||
if ($old_version && version_compare('2021.10.05', $old_version, '>=')) {
|
|
||||||
include_once dirname(__FILE__) . '/inc/lib.epc.update.php';
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
|
|
|
@ -46,7 +46,7 @@ class enhancePostContent
|
||||||
public static function blogAllowedTplValues()
|
public static function blogAllowedTplValues()
|
||||||
{
|
{
|
||||||
dcCore::app()->blog->settings->addNamespace(basename(dirname('../' . __DIR__)));
|
dcCore::app()->blog->settings->addNamespace(basename(dirname('../' . __DIR__)));
|
||||||
$rs = @unserialize(dcCore::app()->blog->settings->__get(basename(dirname('../' . __DIR__)))->allowedtplvalues);
|
$rs = json_decode(dcCore::app()->blog->settings->__get(basename(dirname('../' . __DIR__)))->allowedtplvalues);
|
||||||
|
|
||||||
return is_array($rs) ? $rs : self::defaultAllowedTplValues();
|
return is_array($rs) ? $rs : self::defaultAllowedTplValues();
|
||||||
}
|
}
|
||||||
|
@ -92,7 +92,7 @@ class enhancePostContent
|
||||||
public static function blogAllowedPubPages()
|
public static function blogAllowedPubPages()
|
||||||
{
|
{
|
||||||
dcCore::app()->blog->settings->addNamespace(basename(dirname('../' . __DIR__)));
|
dcCore::app()->blog->settings->addNamespace(basename(dirname('../' . __DIR__)));
|
||||||
$rs = @unserialize(dcCore::app()->blog->settings->__get(basename(dirname('../' . __DIR__)))->allowedpubpages);
|
$rs = json_decode(dcCore::app()->blog->settings->__get(basename(dirname('../' . __DIR__)))->allowedpubpages);
|
||||||
|
|
||||||
return is_array($rs) ? $rs : self::defaultAllowedPubPages();
|
return is_array($rs) ? $rs : self::defaultAllowedPubPages();
|
||||||
}
|
}
|
||||||
|
|
|
@ -108,7 +108,7 @@ abstract class epcFilter
|
||||||
|
|
||||||
private function blogSettings()
|
private function blogSettings()
|
||||||
{
|
{
|
||||||
$opt = @unserialize(dcCore::app()->blog->settings->__get(basename(dirname('../' . __DIR__)))->__get($this->id));
|
$opt = json_decode(dcCore::app()->blog->settings->__get(basename(dirname('../' . __DIR__)))->__get($this->id));
|
||||||
|
|
||||||
if (!is_array($opt)) {
|
if (!is_array($opt)) {
|
||||||
$opt = [];
|
$opt = [];
|
||||||
|
|
|
@ -61,7 +61,7 @@ try {
|
||||||
];
|
];
|
||||||
|
|
||||||
dcCore::app()->blog->settings->addNamespace(basename(__DIR__));
|
dcCore::app()->blog->settings->addNamespace(basename(__DIR__));
|
||||||
dcCore::app()->blog->settings->__get(basename(__DIR__))->put($filter->id(), serialize($f));
|
dcCore::app()->blog->settings->__get(basename(__DIR__))->put($filter->id(), json_encode($f));
|
||||||
|
|
||||||
dcCore::app()->blog->triggerBlog();
|
dcCore::app()->blog->triggerBlog();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue