fixes for Migrate

Author: mambax7

admin/header.php

@@ -50,9 +50,11 @@
 // Local Icons
 $GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
 $GLOBALS['xoopsTpl']->assign('modPathIcon32', $modPathIcon32);
-// Load languages
-xoops_loadLanguage('admin', $thisDirname);
-xoops_loadLanguage('modinfo', $thisDirname);
+
+// Load language files
+$helper->loadLanguage('admin');
+$helper->loadLanguage('modinfo');
+$helper->loadLanguage('common');
 
 xoops_cp_header();
 /** @var \Xmf\Module\Admin $adminObject */

admin/migrate.php

@@ -32,8 +32,8 @@
 use Xmf\Request;
 use XoopsModules\Tdmcreate;
 
-require_once __DIR__ . '/admin_header.php';
-xoops_cp_header();
+require_once __DIR__ . '/header.php';
+//xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
 
@@ -97,4 +97,4 @@
 
 echo "<div>$message</div>";
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__ . '/footer.php';

class/Common/Configurator.php

@@ -37,13 +37,20 @@ class Configurator
     public $oldFiles        = [];
     public $oldFolders      = [];
     public $renameTables    = [];
+    public $moduleStats     = [];
     public $modCopyright;
 
     /**
      * Configurator constructor.
      */
     public function __construct()
     {
+        //        $moduleDirName      = basename(dirname(dirname(__DIR__)));
+        //        $moduleDirNameUpper = mb_strtoupper($moduleDirName);
+
+        //        require dirname(dirname(__DIR__)) . '/config/config.php';
+        //        $config = getConfig();
+
         $config = include dirname(dirname(__DIR__)) . '/config/config.php';
 
         $this->name            = $config->name;

class/Common/Migrate.php

@@ -12,6 +12,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+use \XoopsModules\Tdmcreate\Common;
+
 /**
  * Class Migrate synchronize existing tables with target schema
  *
@@ -21,23 +23,25 @@
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
+
 class Migrate extends \Xmf\Database\Migrate
 {
     private $renameTables;
 
     /**
      * Migrate constructor.
+     * @param Common\Configurator $configurator
      * @throws \RuntimeException
      * @throws \InvalidArgumentException
      */
-    public function __construct()
+    public function __construct(Common\Configurator $configurator = null)
     {
-        require_once dirname(dirname(__DIR__)) . '/include/config.php';
-        $config             = getConfig();
-        $this->renameTables = $config->renameTables;
+        if (null !== $configurator) {
+            $this->renameTables = $configurator->renameTables;
 
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        parent::__construct($moduleDirName);
+            $moduleDirName = basename(dirname(dirname(__DIR__)));
+            parent::__construct($moduleDirName);
+        }
     }
 
     /**
@@ -80,8 +84,8 @@ private function moveDoColumns()
     {
         $tableName    = 'newbb_posts_text';
         $srcTableName = 'newbb_posts';
-        if (false !== $this->tableHandler->useTable($tableName)
-            && false !== $this->tableHandler->useTable($srcTableName)) {
+        if ($this->tableHandler->useTable($tableName)
+            && $this->tableHandler->useTable($srcTableName)) {
             $attributes = $this->tableHandler->getColumnAttributes($tableName, 'dohtml');
             if (false === $attributes) {
                 $this->synchronizeTable($tableName);
@@ -102,12 +106,14 @@ private function moveDoColumns()
      */
     protected function preSyncActions()
     {
+        /*
         // change 'bb' table prefix to 'newbb'
         $this->changePrefix();
         // columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
         $this->moveDoColumns();
         // Convert IP address columns from int to readable varchar(45) for IPv6
         $this->convertIPAddresses('newbb_posts', 'poster_ip');
         $this->convertIPAddresses('newbb_report', 'reporter_ip');
+        */
     }
 }

config/config.php

@@ -18,6 +18,7 @@
  */
 $moduleDirName      = basename(dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
+xoops_loadLanguage('common', $moduleDirName);
 
 return (object)[
     'name'           => mb_strtoupper($moduleDirName) . ' ModuleConfigurator',

include/common.php

@@ -20,6 +20,13 @@
  * @author          Txmod Xoops http://www.txmodxoops.org
  *
  */
+
+use XoopsModules\Tdmcreate;
+include dirname(__DIR__) . '/preloads/autoloader.php';
+
+$moduleDirName = basename(dirname(__DIR__));
+$moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
+
 defined('XOOPS_ROOT_PATH') || exit('Restricted access');
 $dirname = $GLOBALS['xoopsModule']->getVar('dirname');
 // Root Frameworks icons 32x32 directory
@@ -44,6 +51,7 @@
 define('TDMC_IMAGES_LOGOS_URL', TDMC_URL . '/assets/images/logos');
 define('TDMC_ICONS_PATH', TDMC_PATH . '/assets/icons');
 define('TDMC_ICONS_URL', TDMC_URL . '/assets/icons');
+define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', TDMC_URL . '/assets/images/logoModule.png');
 // Uploads Directories
 define('TDMC_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $dirname);
 define('TDMC_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $dirname);

language/english/common.php

@@ -159,9 +159,6 @@
 //define('CO_' . $moduleDirNameUpper . '_' . 'PERMSET', 'The permission has been set');
 //define('CO_' . $moduleDirNameUpper . '_' . 'PERMNOTSET', 'The permission cannot be set');
 
-define('CO_' . $moduleDirNameUpper . '_' . 'TRUNCATE_LENGTH', 'Number of Characters to truncate to the long text field');
-define('CO_' . $moduleDirNameUpper . '_' . 'TRUNCATE_LENGTH_DESC', 'Set the maximum number of characters to truncate the long text fields');
-
 //image config
 define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH', 'Image Display Width');
 define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC', 'Display width for image');
@@ -171,3 +168,16 @@
 define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC', '');
 define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH', 'Image Upload path');
 define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC', 'Path for uploading images');
+
+//Preferences
+define('CO_' . $moduleDirNameUpper . '_' . 'TRUNCATE_LENGTH', 'Number of Characters to truncate to the long text field');
+define('CO_' . $moduleDirNameUpper . '_' . 'TRUNCATE_LENGTH_DESC', 'Set the maximum number of characters to truncate the long text fields');
+
+//Module Stats
+define('CO_' . $moduleDirNameUpper . '_' . 'STATS_SUMMARY', 'Module Statistics');
+define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_CATEGORIES', 'Categories:');
+define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_ITEMS', 'Items');
+define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_OFFLINE', 'Offline');
+define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_PUBLISHED', 'Published');
+define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_REJECTED', 'Rejected');
+define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_SUBMITTED', 'Submitted');