From 8b7d0afabc131a5346d78d1f21e00c240f0a04f5 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Mon, 12 Dec 2022 23:09:12 +0100
Subject: [PATCH] use shorter table name constant

---
 _init.php               |  2 +-
 _install.php            |  2 +-
 _uninstall.php          |  4 ++--
 inc/lib.epc.records.php |  2 +-
 inc/lib.epc.update.php  | 10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/_init.php b/_init.php
index 808a042..75ec68c 100644
--- a/_init.php
+++ b/_init.php
@@ -16,5 +16,5 @@ if (!defined('DC_RC_PATH')) {
 
 class initEnhancePostContent
 {
-    public const EPC_TABLE_NAME = 'epc';
+    public const TABLE_NAME = 'epc';
 }
diff --git a/_install.php b/_install.php
index 85443bb..8308fce 100644
--- a/_install.php
+++ b/_install.php
@@ -25,7 +25,7 @@ try {
 
     # Database
     $s = new dbStruct(dcCore::app()->con, dcCore::app()->prefix);
-    $s->{initEnhancePostContent::EPC_TABLE_NAME}
+    $s->{initEnhancePostContent::TABLE_NAME}
         ->epc_id('bigint', 0, false)
         ->blog_id('varchar', 32, false)
         ->epc_type('varchar', 32, false, "'epc'")
diff --git a/_uninstall.php b/_uninstall.php
index 287d161..dc7700b 100644
--- a/_uninstall.php
+++ b/_uninstall.php
@@ -31,7 +31,7 @@ $this->addUserAction(
     /* action */
     'delete',
     /* ns */
-    initEnhancePostContent::EPC_TABLE_NAME,
+    initEnhancePostContent::TABLE_NAME,
     /* desc */
     __('delete table')
 );
@@ -75,7 +75,7 @@ $this->addDirectAction(
     /* action */
     'delete',
     /* ns */
-    initEnhancePostContent::EPC_TABLE_NAME,
+    initEnhancePostContent::TABLE_NAME,
     /* desc */
     sprintf(__('delete %s table'), 'enhancePostContent')
 );
diff --git a/inc/lib.epc.records.php b/inc/lib.epc.records.php
index 249ec48..8ee6b0c 100644
--- a/inc/lib.epc.records.php
+++ b/inc/lib.epc.records.php
@@ -19,7 +19,7 @@ class epcRecords
     public function __construct()
     {
         $this->con   = dcCore::app()->con;
-        $this->table = dcCore::app()->prefix . initEnhancePostContent::EPC_TABLE_NAME;
+        $this->table = dcCore::app()->prefix . initEnhancePostContent::TABLE_NAME;
         $this->blog  = dcCore::app()->con->escape(dcCore::app()->blog->id);
     }
 
diff --git a/inc/lib.epc.update.php b/inc/lib.epc.update.php
index 4ac8601..d1da930 100644
--- a/inc/lib.epc.update.php
+++ b/inc/lib.epc.update.php
@@ -23,10 +23,10 @@ if ($old_version && version_compare('0.6.6', $old_version, '>=')) {
             $curlist = @unserialize($f->setting_value);
             if (is_array($curlist)) {
                 foreach ($curlist as $k => $v) {
-                    $cur = dcCore::app()->con->openCursor(dcCore::app()->prefix . initEnhancePostContent::EPC_TABLE_NAME);
-                    dcCore::app()->con->writeLock(dcCore::app()->prefix . initEnhancePostContent::EPC_TABLE_NAME);
+                    $cur = dcCore::app()->con->openCursor(dcCore::app()->prefix . initEnhancePostContent::TABLE_NAME);
+                    dcCore::app()->con->writeLock(dcCore::app()->prefix . initEnhancePostContent::TABLE_NAME);
 
-                    $cur->epc_id     = dcCore::app()->con->select('SELECT MAX(epc_id) FROM ' . dcCore::app()->prefix . initEnhancePostContent::EPC_TABLE_NAME . ' ')->f(0) + 1;
+                    $cur->epc_id     = dcCore::app()->con->select('SELECT MAX(epc_id) FROM ' . dcCore::app()->prefix . initEnhancePostContent::TABLE_NAME . ' ')->f(0) + 1;
                     $cur->blog_id    = $f->blog_id;
                     $cur->epc_filter = strtolower($m[1]);
                     $cur->epc_key    = $k;
@@ -42,9 +42,9 @@ if ($old_version && version_compare('0.6.6', $old_version, '>=')) {
 
 # Move old filter name to filter id
 } elseif ($old_version && version_compare('2021.10.05', $old_version, '>=')) {
-    $rs = dcCore::app()->con->select('SELECT epc_id, epc_filter FROM ' . dcCore::app()->prefix . initEnhancePostContent::EPC_TABLE_NAME);
+    $rs = dcCore::app()->con->select('SELECT epc_id, epc_filter FROM ' . dcCore::app()->prefix . initEnhancePostContent::TABLE_NAME);
     while ($rs->fetch()) {
-        $cur = dcCore::app()->con->openCursor(dcCore::app()->prefix . initEnhancePostContent::EPC_TABLE_NAME);
+        $cur = dcCore::app()->con->openCursor(dcCore::app()->prefix . initEnhancePostContent::TABLE_NAME);
 
         $cur->epc_filter = strtolower($rs->epc_filter);