- added permission check approve

Author: ggoffy

_TODO.txt

@@ -18,9 +18,7 @@ this file currently is not rating
 
 
 
-
 Permissions:
-check handling for different groups
 implement autoapprove
 
 

class/Files/Classes/ClassFiles.php

@@ -286,11 +286,7 @@ private function getFunctionForm($module, $table, $fieldId, $fieldInForm)
             $getForm          .= $xc->getXcXoopsHandler('groupperm', "\t\t");
             $getForm          .= $pc->getPhpCodeTernaryOperator('groups', 'is_object(' . $xUser . ')', $xUser . '->getGroups()', 'XOOPS_GROUP_ANONYMOUS', "\t\t");
             $checkRight       = $xc->getXcCheckRight('$grouppermHandler', $permString, 32, '$groups', $xModule . '->getVar(\'mid\')', true);
-            $ternaryOperator  = $pc->getPhpCodeTernaryOperator('permissionUpload', $checkRight, 'true', 'false', "\t\t\t");
-            $permissionUpload = $xc->getXcEqualsOperator('$permissionUpload', 'true', null, "\t\t\t\t");
-            $ternOperator     = $pc->getPhpCodeRemoveCarriageReturn($ternaryOperator, '', "\r");
-            $if               = $pc->getPhpCodeConditions('$isAdmin', '', '', "\t" . $ternaryOperator, $permissionUpload, "\t\t\t");
-            $getForm          .= $pc->getPhpCodeConditions($xUser, '', '', $if, $ternOperator, "\t\t");
+            $getForm  .= $pc->getPhpCodeTernaryOperator('permissionUpload', $checkRight, 'true', 'false', "\t\t");
         }
         $getForm .= $pc->getPhpCodeCommentLine('Title', '', "\t\t");
         $getForm .= $pc->getPhpCodeTernaryOperator('title', '$this->isNew()', "sprintf({$language}{$stuTableSoleName}_ADD)", "sprintf({$language}{$stuTableSoleName}_EDIT)", "\t\t");

class/Files/Classes/ClassFormElements.php

@@ -632,10 +632,15 @@ private function getXoopsFormSelectStatus($language, $moduleDirname, $fieldName,
         $languageShort = substr($language, 0, 4) . mb_strtoupper($moduleDirname) . '_';
         $t            = "\t\t";
         $ret          = $pc->getPhpCodeCommentLine('Form Select', 'Status ' . $ccFieldName, $t);
+        $ret          .= $xc->getXcHandlerLine('permissions', $t);
         $ret          .= $cxc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
         $ret          .= $cxc->getClassAddOption($ccFieldName . 'Select', $xc->getXcGetConstants('STATUS_NONE') . ", {$languageShort}STATUS_NONE", $t);
         $ret          .= $cxc->getClassAddOption($ccFieldName . 'Select', $xc->getXcGetConstants('STATUS_OFFLINE') . ", {$languageShort}STATUS_OFFLINE", $t);
         $ret          .= $cxc->getClassAddOption($ccFieldName . 'Select', $xc->getXcGetConstants('STATUS_SUBMITTED') . ", {$languageShort}STATUS_SUBMITTED", $t);
+
+        $contIf    = $cxc->getClassAddOption($ccFieldName . 'Select', $xc->getXcGetConstants('STATUS_APPROVED') . ", {$languageShort}STATUS_APPROVED", $t . "\t");
+        $ret       .= $pc->getPhpCodeConditions('$permissionsHandler->getPermGlobalApprove()', '', '', $contIf, false, $t);
+
         $ret          .= $cxc->getClassAddOption($ccFieldName . 'Select', $xc->getXcGetConstants('STATUS_APPROVED') . ", {$languageShort}STATUS_APPROVED", $t);
         $ret          .= $cxc->getClassAddOption($ccFieldName . 'Select', $xc->getXcGetConstants('STATUS_BROKEN') . ", {$languageShort}STATUS_BROKEN", $t);
         $ret          .= $cxc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t);

docs/changelog.txt

@@ -20,6 +20,7 @@
 - added check quality/inconsistences of module data before building (goffy)
 - fixed bugs in comments handling (goffy)
 - added notification comments (goffy)
+- added permission check approve (goffy)
 
 <h5>3.03 Alpha 3   [WORK IN PROGRESS - NOT RELEASED]</h5>  Dev: XOOPS 2.5.11, PHP 7.4.5
 <hr>