Merge pull request #58 from ggoffy/master

cosmetics

Author: ggoffy

class/Constants.php

@@ -32,4 +32,6 @@ interface Constants
 	const MORE_FILES_TYPE_EMPTY = 1;
 	const MORE_FILES_TYPE_COPY = 2;
 
+	const FIRST_FIELDELEMENT_TABLE = 30;
+
 }

class/Files/Language/LanguageAdmin.php

@@ -3,7 +3,10 @@
 namespace XoopsModules\Modulebuilder\Files\Language;
 
 use XoopsModules\Modulebuilder;
-use XoopsModules\Modulebuilder\Files;
+use XoopsModules\Modulebuilder\{
+    Files,
+    Constants
+};
 
 /*
  You may not change or alter any portion of this comment or credits
@@ -185,7 +188,7 @@ public function getLanguageAdminClass($language, $tables)
                 $fieldName    = $fields[$f]->getVar('field_name');
                 $fieldElement = $fields[$f]->getVar('field_element');
                 $rpFieldName = $this->getRightString($fieldName);
-                if ($fieldElement > 16) {
+                if ($fieldElement >= Constants::FIRST_FIELDELEMENT_TABLE) {
                     $fieldElements    = Modulebuilder\Helper::getInstance()->getHandler('Fieldelements')->get($fieldElement);
                     $fieldElementName = $fieldElements->getVar('fieldelement_name');
                     $fieldNameDesc    = mb_substr($fieldElementName, \mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName));

class/ModulesHandler.php

@@ -87,7 +87,7 @@ public function getInsertId()
      *
      * @return int
      */
-    public function getCountModules($start = 0, $limit = 0, $sort = 'mod_id ASC, mod_name', $order = 'ASC')
+    public function getCountModules($start = 0, $limit = 0, $sort = 'mod_id', $order = 'DESC')
     {
         $crCountModules = new \CriteriaCompo();
         $crCountModules = $this->getModulesCriteria($crCountModules, $start, $limit, $sort, $order);
@@ -105,7 +105,7 @@ public function getCountModules($start = 0, $limit = 0, $sort = 'mod_id ASC, mod
      *
      * @return array
      */
-    public function getAllModules($start = 0, $limit = 0, $sort = 'mod_id ASC, mod_name', $order = 'ASC')
+    public function getAllModules($start = 0, $limit = 0, $sort = 'mod_id', $order = 'DESC')
     {
         $crAllModules = new \CriteriaCompo();
         $crAllModules = $this->getModulesCriteria($crAllModules, $start, $limit, $sort, $order);

class/TablesHandler.php

@@ -108,7 +108,7 @@ public function getCountTables($start = 0, $limit = 0, $sort = 'table_id ASC, ta
      *
      * @return array
      */
-    public function getAllTables($start = 0, $limit = 0, $sort = 'table_id ASC, table_name', $order = 'ASC')
+    public function getAllTables($start = 0, $limit = 0, $sort = 'table_mid DESC, table_order ASC, table_id', $order = 'DESC')
     {
         $crAllTables = new \CriteriaCompo();
         $crAllTables = $this->getTablesCriteria($crAllTables, $start, $limit, $sort, $order);

docs/changelog.txt

@@ -13,7 +13,7 @@
 - added default type and value for table fieldelements (goffy)
 - fixed bug in deleting table from fieldelements (goffy)
 - added check for sql creation (goffy)
-- delete fields when deleting table (goffy)
+- delete fields if table is deleted (goffy)
 - delete fields, tables, morefiles when deleting module (goffy)
 
 <h5>3.04 Alpha 1   [2020-06-12]</h5>  Dev: XOOPS 2.5.11, PHP 7.4.5