Merge pull request #59 from ggoffy/master

several small fixes

Author: ggoffy

class/Files/CreateTableFields.php

@@ -84,7 +84,7 @@ public function getTableTables($mId, $sort = 'table_id ASC, table_name', $order
      * @param string $order
      * @return mixed
      */
-    public function getTableFields($mId, $tId, $sort = 'field_id ASC, field_name', $order = 'ASC')
+    public function getTableFields($mId, $tId, $sort = 'field_order ASC, field_id', $order = 'ASC')
     {
         $criteria = new \CriteriaCompo();
         $criteria->add(new \Criteria('field_mid', $mId)); // $mId = module Id

class/Files/Sql/SqlFile.php

@@ -186,7 +186,7 @@ private function getDatabaseFields($moduleDirname, $tableMid, $tableId, $tableNa
         $row           = [];
         //$type          = '';
         $fieldTypeName = '';
-        $fields = $this->getTableFields($tableMid, $tableId, 'field_id ASC, field_name');
+        $fields = $this->getTableFields($tableMid, $tableId, 'field_order ASC, field_id');
         foreach (\array_keys($fields) as $f) {
             // Creation of database table
             $ret            = $this->getHeadDatabaseTable($moduleDirname, $tableName, $fieldsNumb);

class/Files/Templates/User/Defstyle/PagesItem.php

@@ -89,11 +89,12 @@ public function write($module, $table, $tables, $filename)
      * @param        $tableMid
      * @param        $tableName
      * @param        $tableSoleName
-     * @param $tableRate
+     * @param        $tableRate
+     * @param        $tableBroken
      * @param        $language
      * @return string
      */
-    private function getTemplatesUserPagesItemPanel($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableRate, $language)
+    private function getTemplatesUserPagesItemPanel($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableRate, $tableBroken, $language)
     {
         $fields  = $this->getTableFields($tableMid, $tableId);
         $ret     = '';
@@ -187,8 +188,10 @@ private function getTemplatesUserPagesItemPanel($moduleDirname, $tableId, $table
         $lang        = $this->sc->getSmartyConst('', '_DELETE');
         $contIf .=  $this->hc->getHtmlAnchor($tableName . ".php?op=delete&{$fieldId}=" . $keyDouble, $lang, $lang, '', 'btn btn-danger right', '', "\t\t\t", "\n");
         $anchors .= $this->sc->getSmartyConditions('permEdit', '', '', $contIf, false, '', '', "\t\t");
-        $lang        = $this->sc->getSmartyConst($language, 'BROKEN');
-        $anchors .=  $this->hc->getHtmlAnchor($tableName . ".php?op=broken&{$fieldId}=" . $keyDouble, $lang, $lang, '', 'btn btn-warning right', '', "\t\t", "\n");
+        if (1 == $tableBroken) {
+            $lang        = $this->sc->getSmartyConst($language, 'BROKEN');
+            $anchors .=  $this->hc->getHtmlAnchor($tableName . ".php?op=broken&{$fieldId}=" . $keyDouble, $lang, $lang, '', 'btn btn-warning right', '', "\t\t", "\n");
+        }
         $retFoot     .= $this->hc->getHtmlDiv($anchors, 'col-sm-12 right',"\t", "\n");
         $ret .= $this->hc->getHtmlDiv($retFoot, 'panel-foot');
         if ($tableRate) {
@@ -217,9 +220,10 @@ public function render()
         $tableName       = $table->getVar('table_name');
         $tableSoleName   = $table->getVar('table_solename');
         $tableRate       = $table->getVar('table_rate');
+        $tableBroken     = $table->getVar('table_broken');
         $tableCategory[] = $table->getVar('table_category');
         if (\in_array(0, $tableCategory)) {
-            $content .= $this->getTemplatesUserPagesItemPanel($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableRate, $language);
+            $content .= $this->getTemplatesUserPagesItemPanel($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableRate, $tableBroken, $language);
         }
 
         $this->create($moduleDirname, 'templates', $filename, $content, _AM_MODULEBUILDER_FILE_CREATED, _AM_MODULEBUILDER_FILE_NOTCREATED);

class/Files/User/UserHeader.php

@@ -97,7 +97,6 @@ public function write($module, $table, $tables, $filename)
     private function getUserHeader($moduleDirname)
     {
         $stuModuleDirname = \mb_strtoupper($moduleDirname);
-        $table            = $this->getTable();
         $tables           = $this->getTables();
         $language         = $this->getLanguage($moduleDirname, 'MA');
 
@@ -106,16 +105,24 @@ private function getUserHeader($moduleDirname)
         $ret .= $this->xc->getXcEqualsOperator('$moduleDirName', '\basename(__DIR__)');
         $ret .= $this->uxc->getUserBreadcrumbsHeaderFile($moduleDirname, $language);
         $ret .= $this->xc->getXcHelperGetInstance($moduleDirname);
+        $permissions = 0;
+        $ratings     = 0;
         if (\is_array($tables)) {
             foreach (\array_keys($tables) as $i) {
                 $tableName = $tables[$i]->getVar('table_name');
                 $ret       .= $this->xc->getXcHandlerLine($tableName);
+                if (1 == $tables[$i]->getVar('table_permissions')) {
+                    $permissions = 1;
+                }
+                if (1 == $tables[$i]->getVar('table_rate')) {
+                    $ratings = 1;
+                }
             }
         }
-        if (1 == $table->getVar('table_permissions')) {
+        if (1 == $permissions) {
             $ret .= $this->xc->getXcHandlerLine('permissions');
         }
-        if (1 == $table->getVar('table_rate')) {
+        if (1 == $ratings) {
             $ret .= $this->xc->getXcHandlerLine('ratings');
         }
         $ret .= $this->pc->getPhpCodeCommentLine();

class/Files/User/UserPages.php

@@ -227,7 +227,7 @@ public function getUserPagesSave($moduleDirname, $fields, $tableName, $tableSole
                 $ccFieldId = $this->getCamelCase($fieldId, false, true);
                 $ucfFieldId = \ucfirst($ccFieldId);
             }
-            if ($fields[$f]->getVar('field_type') >= 10 && $fields[$f]->getVar('field_type') <= 14) {
+            if ($fields[$f]->getVar('field_element') >= 10 && $fields[$f]->getVar('field_element') <= 14) {
                 $countUploader++;
             }
             if (1 == $fields[$f]->getVar('field_main')) {
@@ -257,7 +257,9 @@ public function getUserPagesSave($moduleDirname, $fields, $tableName, $tableSole
         $insert             = $this->xc->getXcHandlerInsert($tableName, $tableName, 'Obj', 'Handler');
 
         $contentInsert = '';
-        $contentInsert .= $this->pc->getPhpCodeTernaryOperator("new{$ucfFieldId}", "\${$ccFieldId} > 0", "\${$ccFieldId}", "\${$tableName}Obj->getNewInsertedId{$ucfTableName}()", $t . "\t");
+        if (1 == $tableNotifications || $countUploader > 0) {
+            $contentInsert .= $this->pc->getPhpCodeTernaryOperator("new{$ucfFieldId}", "\${$ccFieldId} > 0", "\${$ccFieldId}", "\${$tableName}Obj->getNewInsertedId{$ucfTableName}()", $t . "\t");
+        }
 
         if (1 == $tablePermissions) {
             $contentInsert .= $this->xc->getXcXoopsHandler('groupperm', $t . "\t");

docs/changelog.txt

@@ -15,6 +15,9 @@
 - added check for sql creation (goffy)
 - delete fields if table is deleted (goffy)
 - delete fields, tables, morefiles when deleting module (goffy)
+- fixed bug in creation of user header.php (goffy)
+- fixed bug in creation of user pages files (goffy)
+- cosmetics for sorting (goffy)
 
 <h5>3.04 Alpha 1   [2020-06-12]</h5>  Dev: XOOPS 2.5.11, PHP 7.4.5
 <hr>