Merge pull request #157 from ggoffy/master

code improvements

Author: ggoffy

class/Files/Classes/ClassFiles.php

@@ -297,6 +297,8 @@ private function getFunctionForm($module, $table, $fieldId, $fieldInForm, $field
         $xUser            = $this->pc->getPhpCodeGlobals('xoopsUser');
         $xModule          = $this->pc->getPhpCodeGlobals('xoopsModule');
         $getForm          .= $this->pc->getPhpCodeTernaryOperator('isAdmin', '\is_object(' . $xUser . ')', $xUser . '->isAdmin(' . $xModule . '->mid())', 'false', "\t\t");
+        $getForm          .= $this->xc->getXcEqualsOperator('$isAdmin', "\is_object(\$GLOBALS['xoopsUser']) && \$GLOBALS['xoopsUser']->isAdmin(\$GLOBALS['xoopsModule']->mid())", null, "\t\t");
+
         if ($fieldUpload) {
             $permString = 'upload_groups';
             $getForm          .= $this->pc->getPhpCodeCommentLine('Permissions for', 'uploader', "\t\t");

class/Files/Classes/ClassHandlerFiles.php

@@ -147,10 +147,10 @@ private function getClassCreate()
      */
     private function getClassGet()
     {
-        $ret   = $this->pc->getPhpCodeCommentMultiLine(['retrieve a' => 'field', '' => '', '@param int' => '$i field id', '@param null' => 'fields', '@return \XoopsObject|null reference to the' => '{@link Get} object'], "\t");
-        $cClhg = $this->getSimpleString('return parent::get($i, $fields);', "\t\t");
+        $ret   = $this->pc->getPhpCodeCommentMultiLine(['retrieve a' => 'field', '' => '', '@param int' => '$id field id', '@param null' => 'fields', '@return \XoopsObject|null reference to the' => '{@link Get} object'], "\t");
+        $cClhg = $this->getSimpleString('return parent::get($id, $fields);', "\t\t");
 
-        $ret .= $this->pc->getPhpCodeFunction('get', '$i = null, $fields = null', $cClhg, 'public ', false, "\t");
+        $ret .= $this->pc->getPhpCodeFunction('get', '$id = null, $fields = null', $cClhg, 'public ', false, "\t");
 
         return $ret;
     }

docs/changelog.txt

@@ -21,6 +21,8 @@
 - module update to php8 (mamba)
 - fix bug in type cast (liomj/goffy)
 - removed unnecessary sprintf (goffy)
+- replace ternary expression by condition (goffy)
+- using same param name during inheritance (goffy)
 
 <h5>3.5.1 Beta 1   [NOT RELEASED]</h5>  Dev: XOOPS 2.5.11, PHP 7.4.25, PHP 8.0.12, PHP 8.1.0 Beta 4
  - semantic versioning (mamba)