Inspection of "added check for upload permission to form class" - txmodxoops/tdmcreate - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#146)

by Goffy

created 2020-03-25 10:04 UTC

Status

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

@@ -230,7 +230,7 @@  discard block
 block discarded – undo
         $ret            .= $uCodeVComments->getUserModVersion(2, "'com_id'", 'comments', "'itemName'");
         $ret            .= Tdmcreate\Files\CreatePhpCode::getInstance()->getPhpCodeCommentLine('Comment callback functions');
         $ret            .= $uCodeVComments->getUserModVersion(2, "'include/comment_functions.php'", 'comments', "'callbackFile'");
-        $descriptions   = ['approve' => "'{$moduleDirname}CommentsApprove'", 'update' => "'{$moduleDirname}CommentsUpdate'"];
+        $descriptions = ['approve' => "'{$moduleDirname}CommentsApprove'", 'update' => "'{$moduleDirname}CommentsUpdate'"];
         $ret            .= $uCodeVComments->getUserModVersion(3, $descriptions, 'comments', "'callback'");
 
         return $ret;
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
         foreach (array_keys($tables) as $t) {
             $tableName          = $tables[$t]->getVar('table_name');
             $tablePermissions[] = $tables[$t]->getVar('table_permissions');
-            $ret                .= $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, '', true);
+            $ret .= $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, '', true);
         }
         if (in_array(1, $tablePermissions)) {
             $ret .= $this->getXoopsVersionTemplatesLine($moduleDirname, 'permissions', '', true);
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
     private function getXoopsVersionBlocks($moduleDirname, $tables, $language)
     {
         $ret           = $this->getDashComment('Blocks');
-        $ret           .= $this->getSimpleString('$b = 1;');
+        $ret .= $this->getSimpleString('$b = 1;');
         $tableCategory = [];
         foreach (array_keys($tables) as $i) {
             $tableName        = $tables[$i]->getVar('table_name');
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
         $uCodeVTBlocks   = UserXoopsCode::getInstance();
         $stuTableName    = mb_strtoupper($tableName);
         $ucfTableName    = ucfirst($tableName);
-        $ret             = $phpCodeVTBlocks->getPhpCodeCommentLine($ucfTableName . ' ' . $type);
+        $ret             = $phpCodeVTBlocks->getPhpCodeCommentLine($ucfTableName.' '.$type);
         $blocks          = [
             'file'        => "'{$tableName}.php'",
             'name'        => "{$language}{$stuTableName}_BLOCK_{$stuTableSoleName}",
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
         $uCodeVConfig   = UserXoopsCode::getInstance();
         $moduleDirname  = $module->getVar('mod_dirname');
         $ret            = $this->getDashComment('Config');
-        $ret            .= $this->getSimpleString('$c = 1;');
+        $ret .= $this->getSimpleString('$c = 1;');
 
         $table_permissions = 0;
         $table_admin       = 0;
@@ -490,15 +490,15 @@  discard block
 block discarded – undo
                         $stuFieldName = mb_strtoupper($rpFieldName);
                         $ret          .= $phpCodeVConfig->getPhpCodeCommentLine('Editor', $rpFieldName);
                         $ret          .= $xCodeVConfig->getXcLoad('xoopseditorhandler');
-                        $ret          .= $xCodeVConfig->getXcEqualsOperator('$editorHandler' . $ucfFieldName, 'XoopsEditorHandler::getInstance()');
-                        $editor       = [
+                        $ret          .= $xCodeVConfig->getXcEqualsOperator('$editorHandler'.$ucfFieldName, 'XoopsEditorHandler::getInstance()');
+                        $editor = [
                             'name'        => "'editor_{$rpFieldName}'",
                             'title'       => "'{$language}EDITOR_{$stuFieldName}'",
                             'description' => "'{$language}EDITOR_{$stuFieldName}_DESC'",
                             'formtype'    => "'select'",
                             'valuetype'   => "'text'",
                             'default'     => "'dhtml'",
-                            'options'     => 'array_flip($editorHandler' . $ucfFieldName . '->getList())',
+                            'options'     => 'array_flip($editorHandler'.$ucfFieldName.'->getList())',
                         ];
                         $ret          .= $uCodeVConfig->getUserModVersion(3, $editor, 'config', '$c');
                         $ret          .= $this->getSimpleString('++$c;');
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
             $ret         .= $this->getSimpleString('++$c;');
 
             $ret         .= $phpCodeVConfig->getPhpCodeCommentLine('Upload groups');
-            $uplgroups   = [
+            $uplgroups = [
                 'name'        => "'upload_groups'",
                 'title'       => "'{$language}UPLOAD_GROUPS'",
                 'description' => "'{$language}UPLOAD_GROUPS_DESC'",
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
             $ret         .= $this->getSimpleString('++$c;');
         }
         $keyword      = implode(', ', $this->getKeywords());
-        $ret          .= $phpCodeVConfig->getPhpCodeCommentLine('Keywords');
+        $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Keywords');
         $arrayKeyword = [
             'name'        => "'keywords'",
             'title'       => "'{$language}KEYWORDS'",
@@ -602,8 +602,8 @@  discard block
 block discarded – undo
         unset($this->keywords);
 
         if (1 === $field_images) {
-            $ret       .= $phpCodeVConfig->getPhpCodeCommentLine('Uploads : maxsize of image');
-            $maxsize   = [
+            $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Uploads : maxsize of image');
+            $maxsize = [
                 'name'        => "'maxsize'",
                 'title'       => "'{$language}MAXSIZE'",
                 'description' => "'{$language}MAXSIZE_DESC'",
@@ -627,7 +627,7 @@  discard block
 block discarded – undo
             $ret       .= $this->getSimpleString('++$c;');
         }
         if (1 === $table_admin) {
-            $ret        .= $phpCodeVConfig->getPhpCodeCommentLine('Admin pager');
+            $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Admin pager');
             $adminPager = [
                 'name'        => "'adminpager'",
                 'title'       => "'{$language}ADMIN_PAGER'",
@@ -640,7 +640,7 @@  discard block
 block discarded – undo
             $ret        .= $this->getSimpleString('++$c;');
         }
         if (1 === $table_user) {
-            $ret       .= $phpCodeVConfig->getPhpCodeCommentLine('User pager');
+            $ret .= $phpCodeVConfig->getPhpCodeCommentLine('User pager');
             $userPager = [
                 'name'        => "'userpager'",
                 'title'       => "'{$language}USER_PAGER'",
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
             $ret       .= $this->getSimpleString('++$c;');
         }
         if (1 === $table_tag) {
-            $ret    .= $phpCodeVConfig->getPhpCodeCommentLine('Use tag');
+            $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Use tag');
             $useTag = [
                 'name'        => "'usetag'",
                 'title'       => "'{$language}USE_TAG'",
@@ -665,8 +665,8 @@  discard block
 block discarded – undo
             $ret    .= $uCodeVConfig->getUserModVersion(3, $useTag, 'config', '$c');
             $ret    .= $this->getSimpleString('++$c;');
         }
-        $ret              .= $phpCodeVConfig->getPhpCodeCommentLine('Number column');
-        $numbCol          = [
+        $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Number column');
+        $numbCol = [
             'name'        => "'numb_col'",
             'title'       => "'{$language}NUMB_COL'",
             'description' => "'{$language}NUMB_COL_DESC'",
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
         $ret              .= $uCodeVConfig->getUserModVersion(3, $numbCol, 'config', '$c');
         $ret              .= $this->getSimpleString('++$c;');
         $ret              .= $phpCodeVConfig->getPhpCodeCommentLine('Divide by');
-        $divideby         = [
+        $divideby = [
             'name'        => "'divideby'",
             'title'       => "'{$language}DIVIDEBY'",
             'description' => "'{$language}DIVIDEBY_DESC'",
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
         $ret              .= $uCodeVConfig->getUserModVersion(3, $divideby, 'config', '$c');
         $ret              .= $this->getSimpleString('++$c;');
         $ret              .= $phpCodeVConfig->getPhpCodeCommentLine('Table type');
-        $tableType        = [
+        $tableType = [
             'name'        => "'table_type'",
             'title'       => "'{$language}TABLE_TYPE'",
             'description' => "'{$language}DIVIDEBY_DESC'",
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
         $ret              .= $uCodeVConfig->getUserModVersion(3, $tableType, 'config', '$c');
         $ret              .= $this->getSimpleString('++$c;');
         $ret              .= $phpCodeVConfig->getPhpCodeCommentLine('Panel by');
-        $panelType        = [
+        $panelType = [
             'name'        => "'panel_type'",
             'title'       => "'{$language}PANEL_TYPE'",
             'description' => "'{$language}PANEL_TYPE_DESC'",
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
         $ret              .= $uCodeVConfig->getUserModVersion(3, $panelType, 'config', '$c');
         $ret              .= $this->getSimpleString('++$c;');
         $ret              .= $phpCodeVConfig->getPhpCodeCommentLine('Advertise');
-        $advertise        = [
+        $advertise = [
             'name'        => "'advertise'",
             'title'       => "'{$language}ADVERTISE'",
             'description' => "'{$language}ADVERTISE_DESC'",
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
         $ret              .= $uCodeVConfig->getUserModVersion(3, $advertise, 'config', '$c');
         $ret              .= $this->getSimpleString('++$c;');
         $ret              .= $phpCodeVConfig->getPhpCodeCommentLine('Bookmarks');
-        $bookmarks        = [
+        $bookmarks = [
             'name'        => "'bookmarks'",
             'title'       => "'{$language}BOOKMARKS'",
             'description' => "'{$language}BOOKMARKS_DESC'",
@@ -747,7 +747,7 @@  discard block
 block discarded – undo
         $ret              .= $uCodeVConfig->getUserModVersion(3, $facebookComments, 'config', '$c');
         $ret              .= $this->getSimpleString('++$c;');
         $ret              .= $phpCodeVConfig->getPhpCodeCommentLine('Disqus Comments');
-        $disqusComments   = [
+        $disqusComments = [
             'name'        => "'disqus_comments'",
             'title'       => "'{$language}DISQUS_COMMENTS'",
             'description' => "'{$language}DISQUS_COMMENTS_DESC'",
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
         $ret              .= $uCodeVConfig->getUserModVersion(3, $disqusComments, 'config', '$c');
         $ret              .= $this->getSimpleString('++$c;');
         $ret              .= $phpCodeVConfig->getPhpCodeCommentLine('Maintained by');
-        $maintainedby     = [
+        $maintainedby = [
             'name'        => "'maintainedby'",
             'title'       => "'{$language}MAINTAINEDBY'",
             'description' => "'{$language}MAINTAINEDBY_DESC'",
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
         $ret             = '';
         switch ($type) {
             case 'category':
-                $ret      .= $phpCodeNType->getPhpCodeCommentLine('Category Notify');
+                $ret .= $phpCodeNType->getPhpCodeCommentLine('Category Notify');
                 $category = [
                     'name'             => "'category'",
                     'title'            => "'{$language}{$stuTableName}_NOTIFY'",
@@ -803,10 +803,10 @@  discard block
 block discarded – undo
                     'item_name'        => "'{$item}'",
                     "'allow_bookmark'" => '1',
                 ];
-                $ret      .= $uCodeNType->getUserModVersion(3, $category, 'notification', "'{$type}'");
+                $ret .= $uCodeNType->getUserModVersion(3, $category, 'notification', "'{$type}'");
                 break;
             case 'event':
-                $ret   .= $phpCodeNType->getPhpCodeCommentLine('Event Notify');
+                $ret .= $phpCodeNType->getPhpCodeCommentLine('Event Notify');
                 $event = [
                     'name'          => "'{$typeOfNotify}'",
                     'category'      => "'{$tableName}'",
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
                     'mail_template' => "'{$tableName}_{$typeOfNotify}_notify'",
                     'mail_subject'  => "'{$language}{$stuTableName}_{$stuTypeOfNotify}_NOTIFY_SUBJECT'",
                 ];
-                $ret   .= $uCodeNType->getUserModVersion(3, $event, 'notification', "'{$type}'");
+                $ret .= $uCodeNType->getUserModVersion(3, $event, 'notification', "'{$type}'");
                 break;
         }
 
@@ -890,25 +890,25 @@  discard block
 block discarded – undo
             $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_category', 'global', 0, 'global_new_category', $tableSoleName, 'global_newcategory_notify', $num);
             ++$num;
         }
-        $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'modify', 'global', 1, 'global_modify', $tableSoleName, 'global_' . 'modify_notify', $num);
+        $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'modify', 'global', 1, 'global_modify', $tableSoleName, 'global_'.'modify_notify', $num);
         if (in_array(1, $tableBroken)) {
             ++$num;
-            $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'broken', 'global', 1, 'global_broken', $tableSoleName, 'global_' . 'broken_notify', $num);
+            $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'broken', 'global', 1, 'global_broken', $tableSoleName, 'global_'.'broken_notify', $num);
         }
         if (in_array(1, $tableSubmit)) {
             ++$num;
-            $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'submit', 'global', 1, 'global_submit', $tableSoleName, 'global_' . 'submit_notify', $num);
+            $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'submit', 'global', 1, 'global_submit', $tableSoleName, 'global_'.'submit_notify', $num);
         }
         ++$num;
-        $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_' . $tableSoleName, 'global', 0, 'global_new', $tableSoleName, 'global_new' . $tableSoleName . '_notify', $num);
+        $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_'.$tableSoleName, 'global', 0, 'global_new', $tableSoleName, 'global_new'.$tableSoleName.'_notify', $num);
         if (in_array(1, $tableCategory)) {
             ++$num;
-            $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'submit', 'category', 1, 'category_submit', $tableSoleName, 'category_' . $tableSoleName . 'submit_notify', $num);
+            $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'submit', 'category', 1, 'category_submit', $tableSoleName, 'category_'.$tableSoleName.'submit_notify', $num);
             ++$num;
-            $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_category', 'category', 0, 'category', $tableSoleName, 'category_new' . $tableSoleName . '_notify', $num);
+            $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_category', 'category', 0, 'category', $tableSoleName, 'category_new'.$tableSoleName.'_notify', $num);
         }
         ++$num;
-        $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'approve', $tableSoleName, 1, $tableSoleName, $tableSoleName, $tableSoleName . '_approve_notify', $num);
+        $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'approve', $tableSoleName, 1, $tableSoleName, $tableSoleName, $tableSoleName.'_approve_notify', $num);
         unset($num);
 
         return $ret;
@@ -938,7 +938,7 @@  discard block
 block discarded – undo
             'description'    => "{$language}{$title}_NOTIFY_DESC",
             'subscribe_from' => "array('index.php', '{$implodeFrom}.php')",
         ];
-        $ret         .= $uCodeVNG->getUserModVersion(4, $global, 'notification', "'{$type}'", $num);
+        $ret .= $uCodeVNG->getUserModVersion(4, $global, 'notification', "'{$type}'", $num);
 
         return $ret;
     }
@@ -970,7 +970,7 @@  discard block
 block discarded – undo
             'item_name'      => "'{$item}'",
             'allow_bookmark' => (string)$allow,
         ];
-        $ret        .= $uCodeVNC->getUserModVersion(4, $global, 'notification', "'{$type}'", $num);
+        $ret .= $uCodeVNC->getUserModVersion(4, $global, 'notification', "'{$type}'", $num);
 
         return $ret;
     }
@@ -994,7 +994,7 @@  discard block
 block discarded – undo
         $uCodeVNTN   = UserXoopsCode::getInstance();
         $stuTitle    = mb_strtoupper($title);
         $ucfTitle    = ucfirst($title);
-        $ret         = $phpCodeVNTN->getPhpCodeCommentLine($ucfTitle . ' Notify');
+        $ret         = $phpCodeVNTN->getPhpCodeCommentLine($ucfTitle.' Notify');
         $table       = [
             'name'           => "'{$name}'",
             'title'          => "{$language}{$stuTitle}_NOTIFY",
@@ -1003,7 +1003,7 @@  discard block
 block discarded – undo
             'item_name'      => "'{$item}'",
             'allow_bookmark' => (string)$allow,
         ];
-        $ret         .= $uCodeVNTN->getUserModVersion(4, $table, 'notification', "'{$type}'", $num);
+        $ret .= $uCodeVNTN->getUserModVersion(4, $table, 'notification', "'{$type}'", $num);
 
         return $ret;
     }
@@ -1029,7 +1029,7 @@  discard block
 block discarded – undo
         $title       = mb_strtoupper($title);
         $table       = mb_strtoupper($table);
         $ucfTitle    = ucfirst($title);
-        $ret         = $phpCodeVNCC->getPhpCodeCommentLine($ucfTitle . ' Notify');
+        $ret         = $phpCodeVNCC->getPhpCodeCommentLine($ucfTitle.' Notify');
         $event       = [
             'name'          => "'{$name}'",
             'category'      => "'{$category}'",
@@ -1040,7 +1040,7 @@  discard block
 block discarded – undo
             'mail_template' => "'{$mail}'",
             'mail_subject'  => "{$language}{$title}_NOTIFY_SUBJECT",
         ];
-        $ret         .= $uCodeVNCC->getUserModVersion(4, $event, 'notification', "'{$type}'", $num);
+        $ret .= $uCodeVNCC->getUserModVersion(4, $event, 'notification', "'{$type}'", $num);
 
         return $ret;
     }
@@ -1059,14 +1059,14 @@  discard block
 block discarded – undo
         $moduleDirname = $module->getVar('mod_dirname');
         $language      = $this->getLanguage($moduleDirname, 'MI');
         $content       = $this->getHeaderFilesComments($module, $filename);
-        $content       .= $this->getXoopsVersionHeader($module, $language);
+        $content .= $this->getXoopsVersionHeader($module, $language);
         if (1 == $module->getVar('mod_admin')) {
             $content .= $this->getXoopsVersionTemplatesAdmin($moduleDirname, $tables);
         }
         if (1 == $module->getVar('mod_user')) {
             $content .= $this->getXoopsVersionTemplatesUser($moduleDirname, $tables);
         }
-        $content            .= $this->getXoopsVersionMySQL($moduleDirname, $table, $tables);
+        $content .= $this->getXoopsVersionMySQL($moduleDirname, $table, $tables);
         $tableSearch        = [];
         $tableComments      = [];
         $tableSubmenu       = [];

Please login to merge, or discard this patch.

class/Files/Classes/ClassFiles.php 1 patch

Spacing +37 added lines, -37 removed lines patch added patch discarded remove patch

@@ -173,7 +173,7 @@  discard block
 block discarded – undo
         $ucfModuleDirname = ucfirst($moduleDirname);
         $ucfTableName     = ucfirst($tableName);
         $ret              = $pc->getPhpCodeDefined();
-        $ret              .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $ucfModuleDirname . $ucfTableName]);
+        $ret .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $ucfModuleDirname.$ucfTableName]);
         $cCl              = '';
 
         $fieldInForm      = [];
@@ -188,9 +188,9 @@  discard block
 block discarded – undo
             $rpFieldName      = $this->getRightString($fieldName);
             if (in_array(5, $fieldElementId)) {
                 if (count($rpFieldName) % 5) {
-                    $optionsFieldName[] = "'" . $rpFieldName . "'";
+                    $optionsFieldName[] = "'".$rpFieldName."'";
                 } else {
-                    $optionsFieldName[] = "'" . $rpFieldName . "'\n";
+                    $optionsFieldName[] = "'".$rpFieldName."'\n";
                 }
             }
             if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) {
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
         }
         unset($fieldElementId);
 
-        $ret .= $pc->getPhpCodeClass($ucfModuleDirname . $ucfTableName, $cCl, 'XoopsObject');
+        $ret .= $pc->getPhpCodeClass($ucfModuleDirname.$ucfTableName, $cCl, 'XoopsObject');
 
         return $ret;
     }
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
         $getInsertedId = $xc->getXcEqualsOperator('$newInsertedId', "\$GLOBALS['xoopsDB']->getInsertId()", null, false, "\t\t");
         $getInsertedId .= $this->getSimpleString('return $newInsertedId;', "\t\t");
 
-        $ret .= $pc->getPhpCodeFunction('getNewInsertedId' . $ucfTableName, '', $getInsertedId, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getNewInsertedId'.$ucfTableName, '', $getInsertedId, 'public ', false, "\t");
 
         return $ret;
     }
@@ -289,13 +289,13 @@  discard block
 block discarded – undo
         if (1 != $tableCategory/* && (1 == $tablePermissions)*/) {
             $getForm          .= $pc->getPhpCodeCommentLine('Permissions for', 'uploader', "\t\t");
             $getForm          .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_getHandler('groupperm')", null, true, "\t\t");
-            $getForm          .= $pc->getPhpCodeTernaryOperator('groups', 'is_object(' . $xUser . ')', $xUser . '->getGroups()', 'XOOPS_GROUP_ANONYMOUS', "\t\t");
-            $checkRight       = $xc->getXcCheckRight('$gpermHandler', $permString, 32, '$groups', $xModule . '->getVar(\'mid\')', true);
+            $getForm          .= $pc->getPhpCodeTernaryOperator('groups', 'is_object('.$xUser.')', $xUser.'->getGroups()', 'XOOPS_GROUP_ANONYMOUS', "\t\t");
+            $checkRight       = $xc->getXcCheckRight('$gpermHandler', $permString, 32, '$groups', $xModule.'->getVar(\'mid\')', true);
             $ternaryOperator  = $pc->getPhpCodeTernaryOperator('permissionUpload', $checkRight, 'true', 'false', "\t\t\t");
             $permissionUpload = $xc->getXcEqualsOperator('$permissionUpload', 'true', null, false, "\t\t\t\t");
             $ternOperator     = $pc->getPhpCodeRemoveCarriageReturn($ternaryOperator, '', "\r");
-            $if               = $pc->getPhpCodeConditions('!' . $xUser . '->isAdmin(' . $xModule . '->mid())', '', '', "\t" . $ternaryOperator, $permissionUpload, "\t\t\t");
-            $getForm          .= $pc->getPhpCodeConditions($xUser, '', '', $if, $ternOperator, "\t\t");
+            $if               = $pc->getPhpCodeConditions('!'.$xUser.'->isAdmin('.$xModule.'->mid())', '', '', "\t".$ternaryOperator, $permissionUpload, "\t\t\t");
+            $getForm .= $pc->getPhpCodeConditions($xUser, '', '', $if, $ternOperator, "\t\t");
         }
         $getForm .= $pc->getPhpCodeCommentLine('Title', '', "\t\t");
         $getForm .= $pc->getPhpCodeTernaryOperator('title', '$this->isNew()', "sprintf({$language}{$stuTableSoleName}_ADD)", "sprintf({$language}{$stuTableSoleName}_EDIT)", "\t\t");
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
         $getForm .= $cc->getClassAddElement('form', "new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false)");
         $getForm .= $this->getSimpleString('return $form;', "\t\t");
 
-        $ret .= $pc->getPhpCodeFunction('getForm' . $ucfTableName, '$action = false', $getForm, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getForm'.$ucfTableName, '$action = false', $getForm, 'public ', false, "\t");
 
         return $ret;
     }
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
         $ret              = $pc->getPhpCodeCommentMultiLine(['Get' => 'Values', '@param null $keys' => '', '@param null $format' => '', '@param null$maxDepth' => '', '@return' => 'array'], "\t");
         $ucfModuleDirname = ucfirst($moduleDirname);
         $getValues        = $xc->getXcGetInstance((string)$moduleDirname, "{$ucfModuleDirname}Helper", "\t\t");
-        $getValues        .= $xc->getXcEqualsOperator('$ret', '$this->getValues($keys, $format, $maxDepth)', null, false, "\t\t");
+        $getValues .= $xc->getXcEqualsOperator('$ret', '$this->getValues($keys, $format, $maxDepth)', null, false, "\t\t");
 
         foreach (array_keys($fields) as $f) {
             $fieldName    = $fields[$f]->getVar('field_name');
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
         }
         $getValues .= $this->getSimpleString('return $ret;', "\t\t");
 
-        $ret .= $pc->getPhpCodeFunction('getValues' . $ucfTableName, '$keys = null, $format = null, $maxDepth = null', $getValues, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getValues'.$ucfTableName, '$keys = null, $format = null, $maxDepth = null', $getValues, 'public ', false, "\t");
 
         return $ret;
     }
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
         $getToArray .= $pc->getPhpCodeForeach('vars', true, false, 'var', $foreach, "\t\t");
         $getToArray .= $this->getSimpleString('return $ret;', "\t\t");
 
-        $ret .= $pc->getPhpCodeFunction('toArray' . $ucfTableName, '', $getToArray, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('toArray'.$ucfTableName, '', $getToArray, 'public ', false, "\t");
 
         return $ret;
     }
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
 
         $getOptions .= $this->getSimpleString('return $ret;', "\t\t");
 
-        $ret .= $pc->getPhpCodeFunction('getOptions' . $ucfTableName, '', $getOptions, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getOptions'.$ucfTableName, '', $getOptions, 'public ', false, "\t");
 
         return $ret;
     }
@@ -531,8 +531,8 @@  discard block
 block discarded – undo
         $ucfModuleDirname = ucfirst($moduleDirname);
         $ucfTableName     = ucfirst($tableName);
         $ucfTableSoleName = ucfirst($tableSoleName);
-        $ucfModuleTable   = $ucfModuleDirname . $ucfTableName;
-        $multiLineCom     = ['Class Object Handler' => $ucfModuleDirname . $ucfTableName];
+        $ucfModuleTable   = $ucfModuleDirname.$ucfTableName;
+        $multiLineCom     = ['Class Object Handler' => $ucfModuleDirname.$ucfTableName];
         $ret              = $pc->getPhpCodeCommentMultiLine($multiLineCom);
 
         $cClh   = $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => 'null|XoopsDatabase $db'], "\t");
@@ -618,15 +618,15 @@  discard block
 block discarded – undo
         $xc           = Tdmcreate\Files\CreateXoopsCode::getInstance();
         $cc           = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
         $ucfTableName = ucfirst($tableName);
-        $ret          = $pc->getPhpCodeCommentMultiLine(['Get Count ' . $ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
+        $ret          = $pc->getPhpCodeCommentMultiLine(['Get Count '.$ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
 
-        $critCount  = $cc->getClassCriteriaCompo('crCount' . $ucfTableName, "\t\t");
+        $critCount  = $cc->getClassCriteriaCompo('crCount'.$ucfTableName, "\t\t");
         $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crCount{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
-        $critCount  .= $xc->getXcEqualsOperator('$crCount' . $ucfTableName, $paramsCrit, null, false, "\t\t");
+        $critCount  .= $xc->getXcEqualsOperator('$crCount'.$ucfTableName, $paramsCrit, null, false, "\t\t");
         $critCount  .= $this->getSimpleString("return parent::getCount(\$crCount{$ucfTableName});", "\t\t");
         $params     = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
 
-        $ret .= $pc->getPhpCodeFunction('getCount' . $ucfTableName, $params, $critCount, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getCount'.$ucfTableName, $params, $critCount, 'public ', false, "\t");
 
         return $ret;
     }
@@ -646,15 +646,15 @@  discard block
 block discarded – undo
         $xc           = Tdmcreate\Files\CreateXoopsCode::getInstance();
         $cc           = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
         $ucfTableName = ucfirst($tableName);
-        $ret          = $pc->getPhpCodeCommentMultiLine(['Get All ' . $ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t");
+        $ret          = $pc->getPhpCodeCommentMultiLine(['Get All '.$ucfTableName => 'in the database', '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t");
 
-        $critAll    = $cc->getClassCriteriaCompo('crAll' . $ucfTableName, "\t\t");
+        $critAll    = $cc->getClassCriteriaCompo('crAll'.$ucfTableName, "\t\t");
         $paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
-        $critAll    .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCrit, null, false, "\t\t");
+        $critAll    .= $xc->getXcEqualsOperator('$crAll'.$ucfTableName, $paramsCrit, null, false, "\t\t");
         $critAll    .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t");
         $params     = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
 
-        $ret .= $pc->getPhpCodeFunction('getAll' . $ucfTableName, $params, $critAll, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction('getAll'.$ucfTableName, $params, $critAll, 'public ', false, "\t");
 
         return $ret;
     }
@@ -695,19 +695,19 @@  discard block
 block discarded – undo
         $param2  = "\$GLOBALS['xoopsUser']->getGroups()";
         $param3  = "\$GLOBALS['xoopsModule']->getVar('mid')";
         $critAll .= $xc->getXcGetItemIds($lcfTopicTableName, 'gpermHandler', $param1, $param2, $param3, "\t\t");
-        $critAll .= $cc->getClassCriteriaCompo('crAll' . $ucfTableName, "\t\t");
+        $critAll .= $cc->getClassCriteriaCompo('crAll'.$ucfTableName, "\t\t");
 
         if (false !== mb_strpos($fieldName, 'status')) {
-            $crit    = $cc->getClassCriteria('', "'{$fieldName}'", '0', "'!='", true);
-            $critAll .= $cc->getClassAdd('crAll' . $ucfTableName, $crit, "\t\t");
+            $crit = $cc->getClassCriteria('', "'{$fieldName}'", '0', "'!='", true);
+            $critAll .= $cc->getClassAdd('crAll'.$ucfTableName, $crit, "\t\t");
         }
         $paramsCritAll = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
-        $critAll       .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCritAll, null, false, "\t\t");
+        $critAll .= $xc->getXcEqualsOperator('$crAll'.$ucfTableName, $paramsCritAll, null, false, "\t\t");
 
         $critAll .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t");
-        $params  = "\${$tableFieldName}Id, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
+        $params = "\${$tableFieldName}Id, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
 
-        $ret .= $pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id" . $ucfTableName, $params, $critAll, 'public ', false, "\t");
+        $ret .= $pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id".$ucfTableName, $params, $critAll, 'public ', false, "\t");
 
         return $ret;
     }
@@ -723,14 +723,14 @@  discard block
 block discarded – undo
         $pc           = Tdmcreate\Files\CreatePhpCode::getInstance();
         $cc           = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
         $ucfTableName = ucfirst($tableName);
-        $ret          = $pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria ' . $ucfTableName, '@param       ' => "\$cr{$ucfTableName}", '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
+        $ret          = $pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria '.$ucfTableName, '@param       ' => "\$cr{$ucfTableName}", '@param int    $start' => '', '@param int    $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
 
         $paramsAllCriteria = "\$cr{$ucfTableName}, \$start, \$limit, \$sort, \$order";
 
-        $critSets = $cc->getClassSetStart('cr' . $ucfTableName, 'start', "\t\t");
-        $critSets .= $cc->getClassSetLimit('cr' . $ucfTableName, 'limit', "\t\t");
-        $critSets .= $cc->getClassSetSort('cr' . $ucfTableName, 'sort', "\t\t");
-        $critSets .= $cc->getClassSetOrder('cr' . $ucfTableName, 'order', "\t\t");
+        $critSets = $cc->getClassSetStart('cr'.$ucfTableName, 'start', "\t\t");
+        $critSets .= $cc->getClassSetLimit('cr'.$ucfTableName, 'limit', "\t\t");
+        $critSets .= $cc->getClassSetSort('cr'.$ucfTableName, 'sort', "\t\t");
+        $critSets .= $cc->getClassSetOrder('cr'.$ucfTableName, 'order', "\t\t");
         $critSets .= $this->getSimpleString("return \$cr{$ucfTableName};", "\t\t");
 
         $ret .= $pc->getPhpCodeFunction("get{$ucfTableName}Criteria", $paramsAllCriteria, $critSets, 'private ', false, "\t");
@@ -755,9 +755,9 @@  discard block
 block discarded – undo
         $tableSoleName    = $table->getVar('table_solename');
         $ucfTableSoleName = ucfirst($tableSoleName);
         $ccTableSoleName  = $this->getCamelCase($tableSoleName, true);
-        $ret              = $pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName . ' from id', '' => '', '@return' => 'string'], "\t");
+        $ret              = $pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName.' from id', '' => '', '@return' => 'string'], "\t");
         $soleName         = $xc->getXcEqualsOperator("\${$tableSoleName}Id", "(int)( \${$tableSoleName}Id )", null, false, "\t\t");
-        $soleName         .= $xc->getXcEqualsOperator("\${$tableSoleName}", "''", null, false, "\t\t");
+        $soleName .= $xc->getXcEqualsOperator("\${$tableSoleName}", "''", null, false, "\t\t");
 
         $contentIf = $xc->getXoopsHandlerLine($moduleDirname, $tableName, "\t\t\t");
         $contentIf .= $xc->getXcGet($tableName, "\${$tableSoleName}Id", 'Obj', true, false, "\t\t\t");

Please login to merge, or discard this patch.

class/Files/Classes/ClassFormElements.php 1 patch

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

@@ -78,11 +78,11 @@  discard block
 block discarded – undo
             $ret      = $pc->getPhpCodeCommentLine('Form Text', $ucfFieldName, "\t\t");
             $ret      .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", "\t\t");
             $formText = $cc->getClassXoopsFormText('', $language, $fieldName, 20, 150, $ccFieldName, true);
-            $ret      .= $cc->getClassAddElement('form', $formText . $required);
+            $ret      .= $cc->getClassAddElement('form', $formText.$required);
         } else {
             $ret      = $pc->getPhpCodeCommentLine('Form Text', $ucfFieldName, "\t\t");
             $formText = $cc->getClassXoopsFormText('', $language, $fieldName, 50, 255, "this->getVar('{$fieldName}')", true);
-            $ret      .= $cc->getClassAddElement('form', $formText . $required);
+            $ret .= $cc->getClassAddElement('form', $formText.$required);
         }
 
         return $ret;
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $ret          = $pc->getPhpCodeCommentLine('Form Text Area', $ucfFieldName, "\t\t");
         $formTextArea = $cc->getClassXoopsFormTextArea('', $language, $fieldName, 4, 47, true);
-        $ret          .= $cc->getClassAddElement('form', $formTextArea . $required);
+        $ret .= $cc->getClassAddElement('form', $formTextArea.$required);
 
         return $ret;
     }
@@ -130,8 +130,8 @@  discard block
 block discarded – undo
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
 
         $ret       = $pc->getPhpCodeCommentLine('Form editor', $ucfFieldName, "\t\t");
-        $ret       .= $pc->getPhpCodeArray('editorConfigs', null, false, "\t\t");
-        $getConfig = $xc->getXcGetConfig($moduleDirname, 'editor_' . $rpFieldName);
+        $ret .= $pc->getPhpCodeArray('editorConfigs', null, false, "\t\t");
+        $getConfig = $xc->getXcGetConfig($moduleDirname, 'editor_'.$rpFieldName);
         $configs   = [
             'name'   => "'{$fieldName}'",
             'value'  => "\$this->getVar('{$fieldName}', 'e')",
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
             $ret .= $xc->getXcEqualsOperator("\$editorConfigs['{$c}']", $d, null, false, "\t\t");
         }
         $formEditor = $cc->getClassXoopsFormEditor('', $language, $fieldName, 'editorConfigs', true);
-        $ret        .= $cc->getClassAddElement('form', $formEditor . $required);
+        $ret .= $cc->getClassAddElement('form', $formEditor.$required);
 
         return $ret;
     }
@@ -171,20 +171,20 @@  discard block
 block discarded – undo
         $ccFieldName      = $tf->getCamelCase($fieldName, false, true);
         $t                = "\t\t";
         if (in_array(5, $fieldElementId) > 1) {
-            $ret     = $pc->getPhpCodeCommentLine('Form Check Box', 'List Options ' . $ucfFieldName, $t);
+            $ret     = $pc->getPhpCodeCommentLine('Form Check Box', 'List Options '.$ucfFieldName, $t);
             $ret     .= $xc->getXcEqualsOperator('$checkOption', '$this->getOptions()');
-            $foreach = $cc->getClassXoopsFormCheckBox('check' . $ucfFieldName, '<hr />', $tableSoleName . '_option', '$checkOption', false, $t);
-            $foreach .= $cc->getClassSetDescription('check' . $ucfFieldName, "{$language}{$stuTableSoleName}_OPTIONS_DESC", $t);
-            $foreach .= $cc->getClassAddOption('check' . $ucfFieldName, "\$option, {$language}{$stuTableSoleName}_ . strtoupper(\$option)", $t . "\t");
+            $foreach = $cc->getClassXoopsFormCheckBox('check'.$ucfFieldName, '<hr />', $tableSoleName.'_option', '$checkOption', false, $t);
+            $foreach .= $cc->getClassSetDescription('check'.$ucfFieldName, "{$language}{$stuTableSoleName}_OPTIONS_DESC", $t);
+            $foreach .= $cc->getClassAddOption('check'.$ucfFieldName, "\$option, {$language}{$stuTableSoleName}_ . strtoupper(\$option)", $t."\t");
             $ret     .= $pc->getPhpCodeForeach("{$tableName}All", false, false, 'option', $foreach, $t);
             $intElem = "\$check{$ucfFieldName}{$required}";
             $ret     .= $cc->getClassAddElement('form', $intElem, $t);
         } else {
             $ret     = $pc->getPhpCodeCommentLine('Form Check Box', $ucfFieldName, $t);
             $ret     .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t);
-            $ret     .= $cc->getClassXoopsFormCheckBox('check' . $ucfFieldName, (string)$language, $fieldName, "\${$ccFieldName}", false, $t);
+            $ret     .= $cc->getClassXoopsFormCheckBox('check'.$ucfFieldName, (string)$language, $fieldName, "\${$ccFieldName}", false, $t);
             $option  = "1, {$language}";
-            $ret     .= $cc->getClassAddOption('check' . $ucfFieldName, $option, $t);
+            $ret     .= $cc->getClassAddOption('check'.$ucfFieldName, $option, $t);
             $intElem = "\$check{$ucfFieldName}{$required}";
             $ret     .= $cc->getClassAddElement('form', $intElem, $t);
         }
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $ret          = $pc->getPhpCodeCommentLine('Form Hidden', $ucfFieldName, "\t\t");
         $formHidden   = $cc->getClassXoopsFormHidden('', $fieldName, $fieldName, true, true);
-        $ret          .= $cc->getClassAddElement('form', $formHidden);
+        $ret .= $cc->getClassAddElement('form', $formHidden);
 
         return $ret;
     }
@@ -232,16 +232,16 @@  discard block
 block discarded – undo
         $cc              = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
         $stuTableName    = mb_strtoupper($tableName);
         $rpFieldName     = $tf->getRightString($fieldName);
-        $stuSoleName     = mb_strtoupper($tableSoleName . '_' . $rpFieldName);
+        $stuSoleName     = mb_strtoupper($tableSoleName.'_'.$rpFieldName);
         $ucfFieldName    = $tf->getCamelCase($fieldName, true);
         $ccFieldName     = $tf->getCamelCase($fieldName, false, true);
         $t               = "\t\t";
-        $ret             = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files ' . $ucfFieldName, $t);
-        $ret             .= $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
-        $ret             .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t);
+        $ret             = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files '.$ucfFieldName, $t);
+        $ret             .= $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
+        $ret             .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
         $ret             .= $xc->getXcEqualsOperator('$imageDirectory', "'/Frameworks/moduleclasses/icons/32'", null, false, $t);
-        $ret             .= $cc->getClassXoopsFormElementTray('imageTray', $language . $stuSoleName, '<br>', $t);
-        $sprintf         = $pc->getPhpCodeSprintf($language . 'FORM_IMAGE_PATH', '".{$imageDirectory}/"');
+        $ret             .= $cc->getClassXoopsFormElementTray('imageTray', $language.$stuSoleName, '<br>', $t);
+        $sprintf         = $pc->getPhpCodeSprintf($language.'FORM_IMAGE_PATH', '".{$imageDirectory}/"');
         $ret             .= $cc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t);
         $ret             .= $xc->getXcXoopsImgListArray('imageArray', 'XOOPS_ROOT_PATH . $imageDirectory', $t);
         $contForeach     = $cc->getClassAddOption('imageSelect', '"{$image1}", $image1', "\t");
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
         $ret             .= $pc->getPhpCodeCommentLine('Form', 'File', $t);
         $ret             .= $cc->getClassXoopsFormElementTray('fileSelectTray', "''", '<br>', $t);
         $getConfig       = $xc->getXcGetConfig($moduleDirname, 'maxsize');
-        $xoopsFormFile   = $cc->getClassXoopsFormFile('', $language . 'FORM_IMAGE_LIST_' . $stuTableName, 'attachedfile', $getConfig, true, '');
+        $xoopsFormFile   = $cc->getClassXoopsFormFile('', $language.'FORM_IMAGE_LIST_'.$stuTableName, 'attachedfile', $getConfig, true, '');
         $ret             .= $cc->getClassAddElement('fileSelectTray', $xoopsFormFile, $t);
         $xoopsFormLabel1 = $cc->getClassXoopsFormLabel('', "''", null, true, $t);
         $ret             .= $cc->getClassAddElement('fileSelectTray', $xoopsFormLabel1, $t);
@@ -284,12 +284,12 @@  discard block
 block discarded – undo
         $ccFieldName    = $tf->getCamelCase($fieldName, false, true);
         $ucfFieldName   = $tf->getCamelCase($fieldName, true);
         $t              = "\t\t\t";
-        $ret            = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files ' . $ucfFieldName, "\t\t");
-        $contentIf      = $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
-        $contentIf      .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t);
+        $ret            = $pc->getPhpCodeCommentLine('Form Frameworks', 'Image Files '.$ucfFieldName, "\t\t");
+        $contentIf      = $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
+        $contentIf      .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
         $contentIf      .= $xc->getXcEqualsOperator('$uploadDirectory', "'/uploads/{$moduleDirname}/images/shots'", null, false, $t);
-        $contentIf      .= $cc->getClassXoopsFormElementTray('imageTray', $language . 'FORM_IMAGE', '<br>', $t);
-        $sprintf        = $pc->getPhpCodeSprintf($language . 'FORM_PATH', '".{$uploadDirectory}/"');
+        $contentIf      .= $cc->getClassXoopsFormElementTray('imageTray', $language.'FORM_IMAGE', '<br>', $t);
+        $sprintf        = $pc->getPhpCodeSprintf($language.'FORM_PATH', '".{$uploadDirectory}/"');
         $contentIf      .= $cc->getClassXoopsFormSelect('imageSelect', $sprintf, 'selected_image', "\${$moduleDirname}ShotImage", 5, 'false', false, $t);
         $contentIf      .= $xc->getXcXoopsImgListArray('imageArray', 'XOOPS_ROOT_PATH . $uploadDirectory', $t);
         $contForeach    = $cc->getClassAddOption('imageSelect', '"{$image1}", $image1', "\t");
@@ -303,15 +303,15 @@  discard block
 block discarded – undo
         $contentIf      .= $pc->getPhpCodeCommentLine('Form', 'File', "\t\t");
         $contentIf      .= $cc->getClassXoopsFormElementTray('fileSelectTray', "''", '<br>', $t);
         $getConfigFile  = $xc->getXcGetConfig($moduleDirname, 'maxuploadsize');
-        $xoopsFormFile  = $cc->getClassXoopsFormFile('', $language . '_FORM_UPLOAD', 'attachedimage', $getConfigFile, true, '');
-        $contentIf1     = $cc->getClassAddElement('fileSelectTray', $xoopsFormFile . $required, $t . "\t");
+        $xoopsFormFile  = $cc->getClassXoopsFormFile('', $language.'_FORM_UPLOAD', 'attachedimage', $getConfigFile, true, '');
+        $contentIf1     = $cc->getClassAddElement('fileSelectTray', $xoopsFormFile.$required, $t."\t");
 
         $contentIf .= $cc->getClassAddElement('imageTray', '$fileSelectTray', $t);
         $contentIf .= $cc->getClassAddElement('form', "\$imageTray{$required}", $t);
 
         $contentIf = $pc->getPhpCodeConditions('$permissionUpload', ' == ', 'true', $contentIf1, false, $t);
         $getConfig = $xc->getXcGetConfig($moduleDirname, 'useshots');
-        $ret       .= $pc->getPhpCodeConditions($getConfig, null, null, $contentIf, false, "\t\t");
+        $ret .= $pc->getPhpCodeConditions($getConfig, null, null, $contentIf, false, "\t\t");
 
         return $ret;
     }
@@ -335,14 +335,14 @@  discard block
 block discarded – undo
         $cc            = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
         $ucfFieldName  = $tf->getCamelCase($fieldName, true);
         $t             = "\t\t";
-        $ret           = $pc->getPhpCodeCommentLine('Form Url', 'Text File ' . $ucfFieldName, $t);
+        $ret           = $pc->getPhpCodeCommentLine('Form Url', 'Text File '.$ucfFieldName, $t);
         $ret           .= $cc->getClassXoopsFormElementTray('formUrlFile', '_OPTIONS', '<br><br>', $t);
         $ret           .= $pc->getPhpCodeTernaryOperator('formUrl', '$this->isNew()', "'{$fieldDefault}'", "\$this->getVar('{$fieldName}')", $t);
         $ret           .= $cc->getClassXoopsFormText('formText', $language, $fieldName, 75, 255, 'formUrl', false, $t);
-        $ret           .= $cc->getClassAddElement('formUrlFile', '$formText' . $required, $t);
+        $ret           .= $cc->getClassAddElement('formUrlFile', '$formText'.$required, $t);
         $getConfig     = $xc->getXcGetConfig($moduleDirname, 'maxsize');
-        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language . 'UPLOAD', 'attachedfile', $getConfig, true, '');
-        $ret           .= $cc->getClassAddElement('formUrlFile', $xoopsFormFile . $required, $t);
+        $xoopsFormFile = $cc->getClassXoopsFormFile('', $language.'UPLOAD', 'attachedfile', $getConfig, true, '');
+        $ret           .= $cc->getClassAddElement('formUrlFile', $xoopsFormFile.$required, $t);
         $ret           .= $cc->getClassAddElement('form', '$formUrlFile', $t);
 
         return $ret;
@@ -370,13 +370,13 @@  discard block
 block discarded – undo
         $ucfFieldName    = $tf->getCamelCase($fieldName, true);
         $ccFieldName     = $tf->getCamelCase($fieldName, false, true);
         $t               = "\t\t";
-        $ret             = $pc->getPhpCodeCommentLine('Form', 'Image ' . $ucfFieldName, $t);
+        $ret             = $pc->getPhpCodeCommentLine('Form', 'Image '.$ucfFieldName, $t);
         $ret             .= $pc->getPhpCodeCommentLine("Form Image {$ucfFieldName}:", 'Select Uploaded Image ', $t);
-        $ret             .= $xc->getXcEqualsOperator('$get' . $ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
-        $ret             .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get' . $ucfFieldName, '$get' . $ucfFieldName, "'blank.gif'", $t);
+        $ret             .= $xc->getXcEqualsOperator('$get'.$ucfFieldName, "\$this->getVar('{$fieldName}')", null, false, $t);
+        $ret             .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$get'.$ucfFieldName, '$get'.$ucfFieldName, "'blank.gif'", $t);
         $ret             .= $xc->getXcEqualsOperator('$imageDirectory', "'/uploads/{$moduleDirname}/images/{$tableName}'", null, false, $t);
-        $ret             .= $cc->getClassXoopsFormElementTray('imageTray', $language . 'FORM_UPLOAD', '<br>', $t);
-        $sprintf         = $pc->getPhpCodeSprintf($language . 'FORM_IMAGE_PATH', '".{$imageDirectory}/"');
+        $ret             .= $cc->getClassXoopsFormElementTray('imageTray', $language.'FORM_UPLOAD', '<br>', $t);
+        $sprintf         = $pc->getPhpCodeSprintf($language.'FORM_IMAGE_PATH', '".{$imageDirectory}/"');
         $ret             .= $cc->getClassXoopsFormSelect('imageSelect', $sprintf, $fieldName, $ccFieldName, 5, 'false', false, $t);
         $ret             .= $xc->getXcXoopsImgListArray('imageArray', 'XOOPS_ROOT_PATH . $imageDirectory', $t);
         $contForeach     = $cc->getClassAddOption('imageSelect', '"{$image1}", $image1', "\t");
@@ -389,10 +389,10 @@  discard block
 block discarded – undo
         $ret             .= $cc->getClassAddElement('imageTray', $xoopsFormLabel, $t);
         $ret             .= $pc->getPhpCodeCommentLine("Form Image {$ucfFieldName}:", 'Upload Image', $t);
         $getConfig       = $xc->getXcGetConfig($moduleDirname, 'maxsize');
-        $xoopsFormFile   = $cc->getClassXoopsFormFile('imageTray', $language . 'FORM_UPLOAD_NEW', 'attachedfile', $getConfig, true, '');
-        $contIf          = $cc->getClassAddElement('imageTray', $xoopsFormFile, $t . "\t");
+        $xoopsFormFile   = $cc->getClassXoopsFormFile('imageTray', $language.'FORM_UPLOAD_NEW', 'attachedfile', $getConfig, true, '');
+        $contIf          = $cc->getClassAddElement('imageTray', $xoopsFormFile, $t."\t");
         $formHidden      = $cc->getClassXoopsFormHidden('', $fieldName, $ccFieldName, true, true, $t, true);
-        $contElse        = $cc->getClassAddElement('imageTray', $formHidden, $t . "\t");
+        $contElse        = $cc->getClassAddElement('imageTray', $formHidden, $t."\t");
         $ret             .= $pc->getPhpCodeConditions('$permissionUpload', null, null, $contIf, $contElse, "\t\t");
         $ret             .= $cc->getClassAddElement('form', "\$imageTray{$required}", $t);
 
@@ -421,12 +421,12 @@  discard block
 block discarded – undo
         $ccFieldName    = $tf->getCamelCase($fieldName, false, true);
 
         $t              = "\t\t\t";
-        $ret            = $pc->getPhpCodeCommentLine('Form', 'File ' . $ucfFieldName, "\t\t");
-        $ret            .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "''", "\$this->getVar('{$fieldName}')", "\t\t");
+        $ret            = $pc->getPhpCodeCommentLine('Form', 'File '.$ucfFieldName, "\t\t");
+        $ret .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', "''", "\$this->getVar('{$fieldName}')", "\t\t");
 
-        $uForm          = $cc->getClassXoopsFormElementTray('fileUploadTray', $language . 'FORM_UPLOAD', '<br>', $t);
-        $xoopsFormLabel = $cc->getClassXoopsFormLabel('', $language . 'FORM_UPLOAD_FILE_' . $stuTableName, $ccFieldName, true, "\t\t", true);
-        $condIf         = $cc->getClassAddElement('fileUploadTray', $xoopsFormLabel, $t . "\t");
+        $uForm          = $cc->getClassXoopsFormElementTray('fileUploadTray', $language.'FORM_UPLOAD', '<br>', $t);
+        $xoopsFormLabel = $cc->getClassXoopsFormLabel('', $language.'FORM_UPLOAD_FILE_'.$stuTableName, $ccFieldName, true, "\t\t", true);
+        $condIf         = $cc->getClassAddElement('fileUploadTray', $xoopsFormLabel, $t."\t");
         $uForm          .= $pc->getPhpCodeConditions('!$this->isNew()', null, null, $condIf, false, "\t\t\t");
         $getConfig      = $xc->getXcGetConfig($moduleDirname, 'maxsize');
         $xoopsFormFile  = $cc->getClassXoopsFormFile('', "''", $fieldName, $getConfig, true, '');
@@ -458,10 +458,10 @@  discard block
 block discarded – undo
         $cc            = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
         $ucfFieldName  = $tf->getCamelCase($fieldName, true);
         $t             = "\t\t";
-        $ret           = $pc->getPhpCodeCommentLine('Form Color', 'Picker ' . $ucfFieldName, $t);
+        $ret           = $pc->getPhpCodeCommentLine('Form Color', 'Picker '.$ucfFieldName, $t);
         $getVar        = $xc->getXcGetVar('', 'this', $fieldName, true);
         $xoopsFormFile = $cc->getClassXoopsFormColorPicker('', $language, $fieldName, $getVar, true, '');
-        $ret           .= $cc->getClassAddElement('form', $xoopsFormFile, $t);
+        $ret .= $cc->getClassAddElement('form', $xoopsFormFile, $t);
 
         return $ret;
     }
@@ -488,10 +488,10 @@  discard block
 block discarded – undo
         $t            = "\t\t";
         $ret          = $pc->getPhpCodeCommentLine($ucfTableName, 'handler', $t);
         $ret          .= $xc->getXoopsHandlerLine($moduleDirname, $tableName, $t);
-        $ret          .= $pc->getPhpCodeCommentLine('Form', 'Select ' . $ucfTableName, $t);
-        $ret          .= $cc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
-        $ret          .= $cc->getClassAddOption($ccFieldName . 'Select', "'Empty'", $t);
-        $ret          .= $cc->getClassAddOptionArray($ccFieldName . 'Select', "\${$tableName}Handler->getList()", $t);
+        $ret          .= $pc->getPhpCodeCommentLine('Form', 'Select '.$ucfTableName, $t);
+        $ret          .= $cc->getClassXoopsFormSelect($ccFieldName.'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
+        $ret          .= $cc->getClassAddOption($ccFieldName.'Select', "'Empty'", $t);
+        $ret          .= $cc->getClassAddOptionArray($ccFieldName.'Select', "\${$tableName}Handler->getList()", $t);
         $ret          .= $cc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t);
 
         return $ret;
@@ -514,10 +514,10 @@  discard block
 block discarded – undo
         $cc              = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
         $ucfFieldName    = $tf->getCamelCase($fieldName, true);
         $t               = "\t\t";
-        $ret             = $pc->getPhpCodeCommentLine('Form Select', 'User ' . $ucfFieldName, $t);
+        $ret             = $pc->getPhpCodeCommentLine('Form Select', 'User '.$ucfFieldName, $t);
         $getConfig       = $xc->getXcGetConfig($moduleDirname, 'maxsize');
         $xoopsSelectUser = $cc->getClassXoopsFormSelectUser('', $language, $fieldName, 'false', $fieldName, true, $t);
-        $ret             .= $cc->getClassAddElement('form', $xoopsSelectUser . $required, $t);
+        $ret .= $cc->getClassAddElement('form', $xoopsSelectUser.$required, $t);
 
         return $ret;
     }
@@ -539,10 +539,10 @@  discard block
 block discarded – undo
         $ccFieldName  = $tf->getCamelCase($fieldName, false, true);
         $ucfFieldName = $tf->getCamelCase($fieldName, true);
         $t            = "\t\t";
-        $ret          = $pc->getPhpCodeCommentLine('Form Radio', 'Yes/No ' . $ucfFieldName, $t);
+        $ret          = $pc->getPhpCodeCommentLine('Form Radio', 'Yes/No '.$ucfFieldName, $t);
         $ret          .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t);
         $xoopsRadioYN = $cc->getClassXoopsFormRadioYN('', $language, $fieldName, $ccFieldName, true, $t);
-        $ret          .= $cc->getClassAddElement('form', $xoopsRadioYN . $required, $t);
+        $ret          .= $cc->getClassAddElement('form', $xoopsRadioYN.$required, $t);
 
         return $ret;
     }
@@ -564,10 +564,10 @@  discard block
 block discarded – undo
         $t                   = "\t\t";
         $ccFieldName         = $tf->getCamelCase($fieldName, false, true);
         $ucfFieldName        = $tf->getCamelCase($fieldName, true);
-        $ret                 = $pc->getPhpCodeCommentLine('Form Text', 'Date Select ' . $ucfFieldName, $t);
+        $ret                 = $pc->getPhpCodeCommentLine('Form Text', 'Date Select '.$ucfFieldName, $t);
         $ret                 .= $pc->getPhpCodeTernaryOperator($ccFieldName, '$this->isNew()', 0, "\$this->getVar('{$fieldName}')", $t);
         $xoopsTextDateSelect = $cc->getClassXoopsFormTextDateSelect('', $language, $fieldName, $fieldName, $ccFieldName, true, $t);
-        $ret                 .= $cc->getClassAddElement('form', $xoopsTextDateSelect . $required, $t);
+        $ret                 .= $cc->getClassAddElement('form', $xoopsTextDateSelect.$required, $t);
 
         return $ret;
     }
@@ -599,8 +599,8 @@  discard block
 block discarded – undo
             $ret                = $pc->getPhpCodeCommentLine('Form Table', $rpFieldelementName, $t);
             $ccFieldName        = $tf->getCamelCase($fieldName, false, true);
             $ret                .= $xc->getXoopsHandlerLine($moduleDirname, $rpFieldelementName, $t);
-            $ret                .= $cc->getClassXoopsFormSelect($ccFieldName . 'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
-            $ret                .= $cc->getClassAddOptionArray($ccFieldName . 'Select', "\${$rpFieldelementName}Handler->getList()", $t);
+            $ret                .= $cc->getClassXoopsFormSelect($ccFieldName.'Select', $language, $fieldName, "this->getVar('{$fieldName}')", null, '', false, $t);
+            $ret                .= $cc->getClassAddOptionArray($ccFieldName.'Select', "\${$rpFieldelementName}Handler->getList()", $t);
             $ret                .= $cc->getClassAddElement('form', "\${$ccFieldName}Select{$required}", $t);
         }
 
@@ -632,13 +632,13 @@  discard block
 block discarded – undo
         $ret               = $pc->getPhpCodeCommentLine('Form Table', $ucfTopicTableName, $t);
         $ret               .= $xc->getXoopsHandlerLine($moduleDirname, $stlTopicTableName, $t);
         $ret               .= $cc->getClassCriteriaCompo('criteria', $t);
-        $ret               .= $xc->getXcClearHandlerCount($stlTopicTableName . 'Count', $stlTopicTableName, '$criteria', $t);
-        $contIf            = $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/tree', true, false, 'include', $t . "\t");
-        $contIf            .= $xc->getXcClearHandlerAll($stlTopicTableName . 'All', $stlTopicTableName, '$criteria', $t . "\t");
-        $contIf            .= $cc->getClassXoopsObjectTree($stlTopicTableName . 'Tree', $stlTopicTableName . 'All', $fieldId, $fieldPid, $t . "\t");
-        $contIf            .= $cc->getClassXoopsMakeSelBox($ccFieldPid, $stlTopicTableName . 'Tree', $fieldPid, $fieldMain, '--', $fieldPid, $t . "\t");
-        $formLabel         = $cc->getClassXoopsFormLabel('', $language, "\${$ccFieldPid}", true, '');
-        $contIf            .= $cc->getClassAddElement('form', $formLabel, $t . "\t");
+        $ret               .= $xc->getXcClearHandlerCount($stlTopicTableName.'Count', $stlTopicTableName, '$criteria', $t);
+        $contIf = $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'class/tree', true, false, 'include', $t."\t");
+        $contIf            .= $xc->getXcClearHandlerAll($stlTopicTableName.'All', $stlTopicTableName, '$criteria', $t."\t");
+        $contIf            .= $cc->getClassXoopsObjectTree($stlTopicTableName.'Tree', $stlTopicTableName.'All', $fieldId, $fieldPid, $t."\t");
+        $contIf            .= $cc->getClassXoopsMakeSelBox($ccFieldPid, $stlTopicTableName.'Tree', $fieldPid, $fieldMain, '--', $fieldPid, $t."\t");
+        $formLabel = $cc->getClassXoopsFormLabel('', $language, "\${$ccFieldPid}", true, '');
+        $contIf            .= $cc->getClassAddElement('form', $formLabel, $t."\t");
         $ret               .= $pc->getPhpCodeConditions("\${$stlTopicTableName}Count", null, null, $contIf, false, $t);
         $ret               .= $pc->getPhpCodeUnset('criteria', $t);
 
@@ -663,11 +663,11 @@  discard block
 block discarded – undo
         $ret       = $pc->getPhpCodeCommentLine('Use tag', 'module', $t);
         $isDir     = $pc->getPhpCodeIsDir("XOOPS_ROOT_PATH . '/modules/tag'");
         $ret       .= $pc->getPhpCodeTernaryOperator('dirTag', $isDir, 'true', 'false', $t);
-        $paramIf   = '(' . $xc->getXcGetConfig($moduleDirname, 'usetag') . ' == 1)';
-        $condIf    = $pc->getPhpCodeTernaryOperator('tagId', '$this->isNew()', '0', "\$this->getVar('{$fieldId}')", $t . "\t");
-        $condIf    .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'modules/tag/include/formtag', true, false, $type = 'include', $t . "\t");
+        $paramIf   = '('.$xc->getXcGetConfig($moduleDirname, 'usetag').' == 1)';
+        $condIf    = $pc->getPhpCodeTernaryOperator('tagId', '$this->isNew()', '0', "\$this->getVar('{$fieldId}')", $t."\t");
+        $condIf    .= $pc->getPhpCodeIncludeDir('XOOPS_ROOT_PATH', 'modules/tag/include/formtag', true, false, $type = 'include', $t."\t");
         $paramElem = $cc->getClassXoopsFormTag('', 'tag', 60, 255, 'tagId', 0, true, '');
-        $condIf    .= $cc->getClassAddElement('form', $paramElem . $required, $t . "\t");
+        $condIf    .= $cc->getClassAddElement('form', $paramElem.$required, $t."\t");
         $ret       .= $pc->getPhpCodeConditions($paramIf, ' && ', '$dirTag', $condIf, false, $t);
 
         return $ret;
@@ -707,7 +707,7 @@  discard block
 block discarded – undo
                 $fieldId = $fieldName;
             }
             $rpFieldName = $tf->getRightString($fieldName);
-            $language    = $languageFunct . mb_strtoupper($tableSoleName) . '_' . mb_strtoupper($rpFieldName);
+            $language    = $languageFunct.mb_strtoupper($tableSoleName).'_'.mb_strtoupper($rpFieldName);
             $required    = (1 == $fields[$f]->getVar('field_required')) ? ', true' : '';
 
             $fieldElements    = $tc->getHandler('fieldelements')->get($fieldElement);

Please login to merge, or discard this patch.

class/Files/Classes/ClassXoopsCode.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -75,8 +75,8 @@  discard block
 block discarded – undo
      */
     public function getClassCriteria($var, $param1, $param2 = '', $param3 = '', $isParam = false, $t = '')
     {
-        $params = ('' != $param2) ? ', ' . $param2 : '';
-        $params .= ('' != $param3) ? ', ' . $param3 : '';
+        $params = ('' != $param2) ? ', '.$param2 : '';
+        $params .= ('' != $param3) ? ', '.$param3 : '';
 
         if (false === $isParam) {
             $ret = "{$t}\${$var} = new \Criteria( {$param1}{$params} );\n";
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
      */
     public function getClassXoopsFormLabel($var, $param1 = '', $param2 = null, $isParam = false, $t = "\t\t", $useParam = false)
     {
-        $label  = 'new \XoopsFormLabel(';
+        $label = 'new \XoopsFormLabel(';
         if (false === $useParam) {
             $params = null != $param2 ? "{$param1}, {$param2}" : $param1;
         } else {

Please login to merge, or discard this patch.

		@@ -230,7 +230,7 @@ discard block
		block discarded – undo
230	230	$ret .= $uCodeVComments->getUserModVersion(2, "'com_id'", 'comments', "'itemName'");
231	231	$ret .= Tdmcreate\Files\CreatePhpCode::getInstance()->getPhpCodeCommentLine('Comment callback functions');
232	232	$ret .= $uCodeVComments->getUserModVersion(2, "'include/comment_functions.php'", 'comments', "'callbackFile'");
233		- $descriptions = ['approve' => "'{$moduleDirname}CommentsApprove'", 'update' => "'{$moduleDirname}CommentsUpdate'"];
	233	+ $descriptions = ['approve' => "'{$moduleDirname}CommentsApprove'", 'update' => "'{$moduleDirname}CommentsUpdate'"];
234	234	$ret .= $uCodeVComments->getUserModVersion(3, $descriptions, 'comments', "'callback'");
235	235
236	236	return $ret;
		@@ -255,7 +255,7 @@ discard block
		block discarded – undo
255	255	foreach (array_keys($tables) as $t) {
256	256	$tableName = $tables[$t]->getVar('table_name');
257	257	$tablePermissions[] = $tables[$t]->getVar('table_permissions');
258		- $ret .= $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, '', true);
	258	+ $ret .= $this->getXoopsVersionTemplatesLine($moduleDirname, $tableName, '', true);
259	259	}
260	260	if (in_array(1, $tablePermissions)) {
261	261	$ret .= $this->getXoopsVersionTemplatesLine($moduleDirname, 'permissions', '', true);
		@@ -398,7 +398,7 @@ discard block
		block discarded – undo
398	398	private function getXoopsVersionBlocks($moduleDirname, $tables, $language)
399	399	{
400	400	$ret = $this->getDashComment('Blocks');
401		- $ret .= $this->getSimpleString('$b = 1;');
	401	+ $ret .= $this->getSimpleString('$b = 1;');
402	402	$tableCategory = [];
403	403	foreach (array_keys($tables) as $i) {
404	404	$tableName = $tables[$i]->getVar('table_name');
		@@ -437,7 +437,7 @@ discard block
		block discarded – undo
437	437	$uCodeVTBlocks = UserXoopsCode::getInstance();
438	438	$stuTableName = mb_strtoupper($tableName);
439	439	$ucfTableName = ucfirst($tableName);
440		- $ret = $phpCodeVTBlocks->getPhpCodeCommentLine($ucfTableName . ' ' . $type);
	440	+ $ret = $phpCodeVTBlocks->getPhpCodeCommentLine($ucfTableName.' '.$type);
441	441	$blocks = [
442	442	'file' => "'{$tableName}.php'",
443	443	'name' => "{$language}{$stuTableName}_BLOCK_{$stuTableSoleName}",
		@@ -468,7 +468,7 @@ discard block
		block discarded – undo
468	468	$uCodeVConfig = UserXoopsCode::getInstance();
469	469	$moduleDirname = $module->getVar('mod_dirname');
470	470	$ret = $this->getDashComment('Config');
471		- $ret .= $this->getSimpleString('$c = 1;');
	471	+ $ret .= $this->getSimpleString('$c = 1;');
472	472
473	473	$table_permissions = 0;
474	474	$table_admin = 0;
		@@ -490,15 +490,15 @@ discard block
		block discarded – undo
490	490	$stuFieldName = mb_strtoupper($rpFieldName);
491	491	$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Editor', $rpFieldName);
492	492	$ret .= $xCodeVConfig->getXcLoad('xoopseditorhandler');
493		- $ret .= $xCodeVConfig->getXcEqualsOperator('$editorHandler' . $ucfFieldName, 'XoopsEditorHandler::getInstance()');
494		- $editor = [
	493	+ $ret .= $xCodeVConfig->getXcEqualsOperator('$editorHandler'.$ucfFieldName, 'XoopsEditorHandler::getInstance()');
	494	+ $editor = [
495	495	'name' => "'editor_{$rpFieldName}'",
496	496	'title' => "'{$language}EDITOR_{$stuFieldName}'",
497	497	'description' => "'{$language}EDITOR_{$stuFieldName}_DESC'",
498	498	'formtype' => "'select'",
499	499	'valuetype' => "'text'",
500	500	'default' => "'dhtml'",
501		- 'options' => 'array_flip($editorHandler' . $ucfFieldName . '->getList())',
	501	+ 'options' => 'array_flip($editorHandler'.$ucfFieldName.'->getList())',
502	502	];
503	503	$ret .= $uCodeVConfig->getUserModVersion(3, $editor, 'config', '$c');
504	504	$ret .= $this->getSimpleString('++$c;');
		@@ -554,7 +554,7 @@ discard block
		block discarded – undo
554	554	$ret .= $this->getSimpleString('++$c;');
555	555
556	556	$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Upload groups');
557		- $uplgroups = [
	557	+ $uplgroups = [
558	558	'name' => "'upload_groups'",
559	559	'title' => "'{$language}UPLOAD_GROUPS'",
560	560	'description' => "'{$language}UPLOAD_GROUPS_DESC'",
		@@ -588,7 +588,7 @@ discard block
		block discarded – undo
588	588	$ret .= $this->getSimpleString('++$c;');
589	589	}
590	590	$keyword = implode(', ', $this->getKeywords());
591		- $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Keywords');
	591	+ $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Keywords');
592	592	$arrayKeyword = [
593	593	'name' => "'keywords'",
594	594	'title' => "'{$language}KEYWORDS'",
		@@ -602,8 +602,8 @@ discard block
		block discarded – undo
602	602	unset($this->keywords);
603	603
604	604	if (1 === $field_images) {
605		- $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Uploads : maxsize of image');
606		- $maxsize = [
	605	+ $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Uploads : maxsize of image');
	606	+ $maxsize = [
607	607	'name' => "'maxsize'",
608	608	'title' => "'{$language}MAXSIZE'",
609	609	'description' => "'{$language}MAXSIZE_DESC'",
		@@ -627,7 +627,7 @@ discard block
		block discarded – undo
627	627	$ret .= $this->getSimpleString('++$c;');
628	628	}
629	629	if (1 === $table_admin) {
630		- $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Admin pager');
	630	+ $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Admin pager');
631	631	$adminPager = [
632	632	'name' => "'adminpager'",
633	633	'title' => "'{$language}ADMIN_PAGER'",
		@@ -640,7 +640,7 @@ discard block
		block discarded – undo
640	640	$ret .= $this->getSimpleString('++$c;');
641	641	}
642	642	if (1 === $table_user) {
643		- $ret .= $phpCodeVConfig->getPhpCodeCommentLine('User pager');
	643	+ $ret .= $phpCodeVConfig->getPhpCodeCommentLine('User pager');
644	644	$userPager = [
645	645	'name' => "'userpager'",
646	646	'title' => "'{$language}USER_PAGER'",
		@@ -653,7 +653,7 @@ discard block
		block discarded – undo
653	653	$ret .= $this->getSimpleString('++$c;');
654	654	}
655	655	if (1 === $table_tag) {
656		- $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Use tag');
	656	+ $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Use tag');
657	657	$useTag = [
658	658	'name' => "'usetag'",
659	659	'title' => "'{$language}USE_TAG'",
		@@ -665,8 +665,8 @@ discard block
		block discarded – undo
665	665	$ret .= $uCodeVConfig->getUserModVersion(3, $useTag, 'config', '$c');
666	666	$ret .= $this->getSimpleString('++$c;');
667	667	}
668		- $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Number column');
669		- $numbCol = [
	668	+ $ret .= $phpCodeVConfig->getPhpCodeCommentLine('Number column');
	669	+ $numbCol = [
670	670	'name' => "'numb_col'",
671	671	'title' => "'{$language}NUMB_COL'",
672	672	'description' => "'{$language}NUMB_COL_DESC'",
		@@ -678,7 +678,7 @@ discard block
		block discarded – undo
678	678	$ret .= $uCodeVConfig->getUserModVersion(3, $numbCol, 'config', '$c');
679	679	$ret .= $this->getSimpleString('++$c;');
680	680	$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Divide by');
681		- $divideby = [
	681	+ $divideby = [
682	682	'name' => "'divideby'",
683	683	'title' => "'{$language}DIVIDEBY'",
684	684	'description' => "'{$language}DIVIDEBY_DESC'",
		@@ -690,7 +690,7 @@ discard block
		block discarded – undo
690	690	$ret .= $uCodeVConfig->getUserModVersion(3, $divideby, 'config', '$c');
691	691	$ret .= $this->getSimpleString('++$c;');
692	692	$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Table type');
693		- $tableType = [
	693	+ $tableType = [
694	694	'name' => "'table_type'",
695	695	'title' => "'{$language}TABLE_TYPE'",
696	696	'description' => "'{$language}DIVIDEBY_DESC'",
		@@ -702,7 +702,7 @@ discard block
		block discarded – undo
702	702	$ret .= $uCodeVConfig->getUserModVersion(3, $tableType, 'config', '$c');
703	703	$ret .= $this->getSimpleString('++$c;');
704	704	$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Panel by');
705		- $panelType = [
	705	+ $panelType = [
706	706	'name' => "'panel_type'",
707	707	'title' => "'{$language}PANEL_TYPE'",
708	708	'description' => "'{$language}PANEL_TYPE_DESC'",
		@@ -714,7 +714,7 @@ discard block
		block discarded – undo
714	714	$ret .= $uCodeVConfig->getUserModVersion(3, $panelType, 'config', '$c');
715	715	$ret .= $this->getSimpleString('++$c;');
716	716	$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Advertise');
717		- $advertise = [
	717	+ $advertise = [
718	718	'name' => "'advertise'",
719	719	'title' => "'{$language}ADVERTISE'",
720	720	'description' => "'{$language}ADVERTISE_DESC'",
		@@ -725,7 +725,7 @@ discard block
		block discarded – undo
725	725	$ret .= $uCodeVConfig->getUserModVersion(3, $advertise, 'config', '$c');
726	726	$ret .= $this->getSimpleString('++$c;');
727	727	$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Bookmarks');
728		- $bookmarks = [
	728	+ $bookmarks = [
729	729	'name' => "'bookmarks'",
730	730	'title' => "'{$language}BOOKMARKS'",
731	731	'description' => "'{$language}BOOKMARKS_DESC'",
		@@ -747,7 +747,7 @@ discard block
		block discarded – undo
747	747	$ret .= $uCodeVConfig->getUserModVersion(3, $facebookComments, 'config', '$c');
748	748	$ret .= $this->getSimpleString('++$c;');
749	749	$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Disqus Comments');
750		- $disqusComments = [
	750	+ $disqusComments = [
751	751	'name' => "'disqus_comments'",
752	752	'title' => "'{$language}DISQUS_COMMENTS'",
753	753	'description' => "'{$language}DISQUS_COMMENTS_DESC'",
		@@ -758,7 +758,7 @@ discard block
		block discarded – undo
758	758	$ret .= $uCodeVConfig->getUserModVersion(3, $disqusComments, 'config', '$c');
759	759	$ret .= $this->getSimpleString('++$c;');
760	760	$ret .= $phpCodeVConfig->getPhpCodeCommentLine('Maintained by');
761		- $maintainedby = [
	761	+ $maintainedby = [
762	762	'name' => "'maintainedby'",
763	763	'title' => "'{$language}MAINTAINEDBY'",
764	764	'description' => "'{$language}MAINTAINEDBY_DESC'",
		@@ -794,7 +794,7 @@ discard block
		block discarded – undo
794	794	$ret = '';
795	795	switch ($type) {
796	796	case 'category':
797		- $ret .= $phpCodeNType->getPhpCodeCommentLine('Category Notify');
	797	+ $ret .= $phpCodeNType->getPhpCodeCommentLine('Category Notify');
798	798	$category = [
799	799	'name' => "'category'",
800	800	'title' => "'{$language}{$stuTableName}_NOTIFY'",
		@@ -803,10 +803,10 @@ discard block
		block discarded – undo
803	803	'item_name' => "'{$item}'",
804	804	"'allow_bookmark'" => '1',
805	805	];
806		- $ret .= $uCodeNType->getUserModVersion(3, $category, 'notification', "'{$type}'");
	806	+ $ret .= $uCodeNType->getUserModVersion(3, $category, 'notification', "'{$type}'");
807	807	break;
808	808	case 'event':
809		- $ret .= $phpCodeNType->getPhpCodeCommentLine('Event Notify');
	809	+ $ret .= $phpCodeNType->getPhpCodeCommentLine('Event Notify');
810	810	$event = [
811	811	'name' => "'{$typeOfNotify}'",
812	812	'category' => "'{$tableName}'",
		@@ -817,7 +817,7 @@ discard block
		block discarded – undo
817	817	'mail_template' => "'{$tableName}_{$typeOfNotify}_notify'",
818	818	'mail_subject' => "'{$language}{$stuTableName}_{$stuTypeOfNotify}_NOTIFY_SUBJECT'",
819	819	];
820		- $ret .= $uCodeNType->getUserModVersion(3, $event, 'notification', "'{$type}'");
	820	+ $ret .= $uCodeNType->getUserModVersion(3, $event, 'notification', "'{$type}'");
821	821	break;
822	822	}
823	823
		@@ -890,25 +890,25 @@ discard block
		block discarded – undo
890	890	$ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_category', 'global', 0, 'global_new_category', $tableSoleName, 'global_newcategory_notify', $num);
891	891	++$num;
892	892	}
893		- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'modify', 'global', 1, 'global_modify', $tableSoleName, 'global_' . 'modify_notify', $num);
	893	+ $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'modify', 'global', 1, 'global_modify', $tableSoleName, 'global_'.'modify_notify', $num);
894	894	if (in_array(1, $tableBroken)) {
895	895	++$num;
896		- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'broken', 'global', 1, 'global_broken', $tableSoleName, 'global_' . 'broken_notify', $num);
	896	+ $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'broken', 'global', 1, 'global_broken', $tableSoleName, 'global_'.'broken_notify', $num);
897	897	}
898	898	if (in_array(1, $tableSubmit)) {
899	899	++$num;
900		- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'submit', 'global', 1, 'global_submit', $tableSoleName, 'global_' . 'submit_notify', $num);
	900	+ $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'submit', 'global', 1, 'global_submit', $tableSoleName, 'global_'.'submit_notify', $num);
901	901	}
902	902	++$num;
903		- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_' . $tableSoleName, 'global', 0, 'global_new', $tableSoleName, 'global_new' . $tableSoleName . '_notify', $num);
	903	+ $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_'.$tableSoleName, 'global', 0, 'global_new', $tableSoleName, 'global_new'.$tableSoleName.'_notify', $num);
904	904	if (in_array(1, $tableCategory)) {
905	905	++$num;
906		- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'submit', 'category', 1, 'category_submit', $tableSoleName, 'category_' . $tableSoleName . 'submit_notify', $num);
	906	+ $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'submit', 'category', 1, 'category_submit', $tableSoleName, 'category_'.$tableSoleName.'submit_notify', $num);
907	907	++$num;
908		- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_category', 'category', 0, 'category', $tableSoleName, 'category_new' . $tableSoleName . '_notify', $num);
	908	+ $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'new_category', 'category', 0, 'category', $tableSoleName, 'category_new'.$tableSoleName.'_notify', $num);
909	909	}
910	910	++$num;
911		- $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'approve', $tableSoleName, 1, $tableSoleName, $tableSoleName, $tableSoleName . '_approve_notify', $num);
	911	+ $ret .= $this->getXoopsVersionNotificationCodeComplete($language, 'event', 'approve', $tableSoleName, 1, $tableSoleName, $tableSoleName, $tableSoleName.'_approve_notify', $num);
912	912	unset($num);
913	913
914	914	return $ret;
		@@ -938,7 +938,7 @@ discard block
		block discarded – undo
938	938	'description' => "{$language}{$title}_NOTIFY_DESC",
939	939	'subscribe_from' => "array('index.php', '{$implodeFrom}.php')",
940	940	];
941		- $ret .= $uCodeVNG->getUserModVersion(4, $global, 'notification', "'{$type}'", $num);
	941	+ $ret .= $uCodeVNG->getUserModVersion(4, $global, 'notification', "'{$type}'", $num);
942	942
943	943	return $ret;
944	944	}
		@@ -970,7 +970,7 @@ discard block
		block discarded – undo
970	970	'item_name' => "'{$item}'",
971	971	'allow_bookmark' => (string)$allow,
972	972	];
973		- $ret .= $uCodeVNC->getUserModVersion(4, $global, 'notification', "'{$type}'", $num);
	973	+ $ret .= $uCodeVNC->getUserModVersion(4, $global, 'notification', "'{$type}'", $num);
974	974
975	975	return $ret;
976	976	}
		@@ -994,7 +994,7 @@ discard block
		block discarded – undo
994	994	$uCodeVNTN = UserXoopsCode::getInstance();
995	995	$stuTitle = mb_strtoupper($title);
996	996	$ucfTitle = ucfirst($title);
997		- $ret = $phpCodeVNTN->getPhpCodeCommentLine($ucfTitle . ' Notify');
	997	+ $ret = $phpCodeVNTN->getPhpCodeCommentLine($ucfTitle.' Notify');
998	998	$table = [
999	999	'name' => "'{$name}'",
1000	1000	'title' => "{$language}{$stuTitle}_NOTIFY",
		@@ -1003,7 +1003,7 @@ discard block
		block discarded – undo
1003	1003	'item_name' => "'{$item}'",
1004	1004	'allow_bookmark' => (string)$allow,
1005	1005	];
1006		- $ret .= $uCodeVNTN->getUserModVersion(4, $table, 'notification', "'{$type}'", $num);
	1006	+ $ret .= $uCodeVNTN->getUserModVersion(4, $table, 'notification', "'{$type}'", $num);
1007	1007
1008	1008	return $ret;
1009	1009	}
		@@ -1029,7 +1029,7 @@ discard block
		block discarded – undo
1029	1029	$title = mb_strtoupper($title);
1030	1030	$table = mb_strtoupper($table);
1031	1031	$ucfTitle = ucfirst($title);
1032		- $ret = $phpCodeVNCC->getPhpCodeCommentLine($ucfTitle . ' Notify');
	1032	+ $ret = $phpCodeVNCC->getPhpCodeCommentLine($ucfTitle.' Notify');
1033	1033	$event = [
1034	1034	'name' => "'{$name}'",
1035	1035	'category' => "'{$category}'",
		@@ -1040,7 +1040,7 @@ discard block
		block discarded – undo
1040	1040	'mail_template' => "'{$mail}'",
1041	1041	'mail_subject' => "{$language}{$title}_NOTIFY_SUBJECT",
1042	1042	];
1043		- $ret .= $uCodeVNCC->getUserModVersion(4, $event, 'notification', "'{$type}'", $num);
	1043	+ $ret .= $uCodeVNCC->getUserModVersion(4, $event, 'notification', "'{$type}'", $num);
1044	1044
1045	1045	return $ret;
1046	1046	}
		@@ -1059,14 +1059,14 @@ discard block
		block discarded – undo
1059	1059	$moduleDirname = $module->getVar('mod_dirname');
1060	1060	$language = $this->getLanguage($moduleDirname, 'MI');
1061	1061	$content = $this->getHeaderFilesComments($module, $filename);
1062		- $content .= $this->getXoopsVersionHeader($module, $language);
	1062	+ $content .= $this->getXoopsVersionHeader($module, $language);
1063	1063	if (1 == $module->getVar('mod_admin')) {
1064	1064	$content .= $this->getXoopsVersionTemplatesAdmin($moduleDirname, $tables);
1065	1065	}
1066	1066	if (1 == $module->getVar('mod_user')) {
1067	1067	$content .= $this->getXoopsVersionTemplatesUser($moduleDirname, $tables);
1068	1068	}
1069		- $content .= $this->getXoopsVersionMySQL($moduleDirname, $table, $tables);
	1069	+ $content .= $this->getXoopsVersionMySQL($moduleDirname, $table, $tables);
1070	1070	$tableSearch = [];
1071	1071	$tableComments = [];
1072	1072	$tableSubmenu = [];

		@@ -173,7 +173,7 @@ discard block
		block discarded – undo
173	173	$ucfModuleDirname = ucfirst($moduleDirname);
174	174	$ucfTableName = ucfirst($tableName);
175	175	$ret = $pc->getPhpCodeDefined();
176		- $ret .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $ucfModuleDirname . $ucfTableName]);
	176	+ $ret .= $pc->getPhpCodeCommentMultiLine(['Class Object' => $ucfModuleDirname.$ucfTableName]);
177	177	$cCl = '';
178	178
179	179	$fieldInForm = [];
		@@ -188,9 +188,9 @@ discard block
		block discarded – undo
188	188	$rpFieldName = $this->getRightString($fieldName);
189	189	if (in_array(5, $fieldElementId)) {
190	190	if (count($rpFieldName) % 5) {
191		- $optionsFieldName[] = "'" . $rpFieldName . "'";
	191	+ $optionsFieldName[] = "'".$rpFieldName."'";
192	192	} else {
193		- $optionsFieldName[] = "'" . $rpFieldName . "'\n";
	193	+ $optionsFieldName[] = "'".$rpFieldName."'\n";
194	194	}
195	195	}
196	196	if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) {
		@@ -225,7 +225,7 @@ discard block
		block discarded – undo
225	225	}
226	226	unset($fieldElementId);
227	227
228		- $ret .= $pc->getPhpCodeClass($ucfModuleDirname . $ucfTableName, $cCl, 'XoopsObject');
	228	+ $ret .= $pc->getPhpCodeClass($ucfModuleDirname.$ucfTableName, $cCl, 'XoopsObject');
229	229
230	230	return $ret;
231	231	}
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247	$getInsertedId = $xc->getXcEqualsOperator('$newInsertedId', "\$GLOBALS['xoopsDB']->getInsertId()", null, false, "\t\t");
248	248	$getInsertedId .= $this->getSimpleString('return $newInsertedId;', "\t\t");
249	249
250		- $ret .= $pc->getPhpCodeFunction('getNewInsertedId' . $ucfTableName, '', $getInsertedId, 'public ', false, "\t");
	250	+ $ret .= $pc->getPhpCodeFunction('getNewInsertedId'.$ucfTableName, '', $getInsertedId, 'public ', false, "\t");
251	251
252	252	return $ret;
253	253	}
		@@ -289,13 +289,13 @@ discard block
		block discarded – undo
289	289	if (1 != $tableCategory/* && (1 == $tablePermissions)*/) {
290	290	$getForm .= $pc->getPhpCodeCommentLine('Permissions for', 'uploader', "\t\t");
291	291	$getForm .= $xc->getXcEqualsOperator('$gpermHandler', "xoops_getHandler('groupperm')", null, true, "\t\t");
292		- $getForm .= $pc->getPhpCodeTernaryOperator('groups', 'is_object(' . $xUser . ')', $xUser . '->getGroups()', 'XOOPS_GROUP_ANONYMOUS', "\t\t");
293		- $checkRight = $xc->getXcCheckRight('$gpermHandler', $permString, 32, '$groups', $xModule . '->getVar(\'mid\')', true);
	292	+ $getForm .= $pc->getPhpCodeTernaryOperator('groups', 'is_object('.$xUser.')', $xUser.'->getGroups()', 'XOOPS_GROUP_ANONYMOUS', "\t\t");
	293	+ $checkRight = $xc->getXcCheckRight('$gpermHandler', $permString, 32, '$groups', $xModule.'->getVar(\'mid\')', true);
294	294	$ternaryOperator = $pc->getPhpCodeTernaryOperator('permissionUpload', $checkRight, 'true', 'false', "\t\t\t");
295	295	$permissionUpload = $xc->getXcEqualsOperator('$permissionUpload', 'true', null, false, "\t\t\t\t");
296	296	$ternOperator = $pc->getPhpCodeRemoveCarriageReturn($ternaryOperator, '', "\r");
297		- $if = $pc->getPhpCodeConditions('!' . $xUser . '->isAdmin(' . $xModule . '->mid())', '', '', "\t" . $ternaryOperator, $permissionUpload, "\t\t\t");
298		- $getForm .= $pc->getPhpCodeConditions($xUser, '', '', $if, $ternOperator, "\t\t");
	297	+ $if = $pc->getPhpCodeConditions('!'.$xUser.'->isAdmin('.$xModule.'->mid())', '', '', "\t".$ternaryOperator, $permissionUpload, "\t\t\t");
	298	+ $getForm .= $pc->getPhpCodeConditions($xUser, '', '', $if, $ternOperator, "\t\t");
299	299	}
300	300	$getForm .= $pc->getPhpCodeCommentLine('Title', '', "\t\t");
301	301	$getForm .= $pc->getPhpCodeTernaryOperator('title', '$this->isNew()', "sprintf({$language}{$stuTableSoleName}_ADD)", "sprintf({$language}{$stuTableSoleName}_EDIT)", "\t\t");
		@@ -317,7 +317,7 @@ discard block
		block discarded – undo
317	317	$getForm .= $cc->getClassAddElement('form', "new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false)");
318	318	$getForm .= $this->getSimpleString('return $form;', "\t\t");
319	319
320		- $ret .= $pc->getPhpCodeFunction('getForm' . $ucfTableName, '$action = false', $getForm, 'public ', false, "\t");
	320	+ $ret .= $pc->getPhpCodeFunction('getForm'.$ucfTableName, '$action = false', $getForm, 'public ', false, "\t");
321	321
322	322	return $ret;
323	323	}
		@@ -392,7 +392,7 @@ discard block
		block discarded – undo
392	392	$ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Values', '@param null $keys' => '', '@param null $format' => '', '@param null$maxDepth' => '', '@return' => 'array'], "\t");
393	393	$ucfModuleDirname = ucfirst($moduleDirname);
394	394	$getValues = $xc->getXcGetInstance((string)$moduleDirname, "{$ucfModuleDirname}Helper", "\t\t");
395		- $getValues .= $xc->getXcEqualsOperator('$ret', '$this->getValues($keys, $format, $maxDepth)', null, false, "\t\t");
	395	+ $getValues .= $xc->getXcEqualsOperator('$ret', '$this->getValues($keys, $format, $maxDepth)', null, false, "\t\t");
396	396
397	397	foreach (array_keys($fields) as $f) {
398	398	$fieldName = $fields[$f]->getVar('field_name');
		@@ -438,7 +438,7 @@ discard block
		block discarded – undo
438	438	}
439	439	$getValues .= $this->getSimpleString('return $ret;', "\t\t");
440	440
441		- $ret .= $pc->getPhpCodeFunction('getValues' . $ucfTableName, '$keys = null, $format = null, $maxDepth = null', $getValues, 'public ', false, "\t");
	441	+ $ret .= $pc->getPhpCodeFunction('getValues'.$ucfTableName, '$keys = null, $format = null, $maxDepth = null', $getValues, 'public ', false, "\t");
442	442
443	443	return $ret;
444	444	}
		@@ -465,7 +465,7 @@ discard block
		block discarded – undo
465	465	$getToArray .= $pc->getPhpCodeForeach('vars', true, false, 'var', $foreach, "\t\t");
466	466	$getToArray .= $this->getSimpleString('return $ret;', "\t\t");
467	467
468		- $ret .= $pc->getPhpCodeFunction('toArray' . $ucfTableName, '', $getToArray, 'public ', false, "\t");
	468	+ $ret .= $pc->getPhpCodeFunction('toArray'.$ucfTableName, '', $getToArray, 'public ', false, "\t");
469	469
470	470	return $ret;
471	471	}
		@@ -502,7 +502,7 @@ discard block
		block discarded – undo
502	502
503	503	$getOptions .= $this->getSimpleString('return $ret;', "\t\t");
504	504
505		- $ret .= $pc->getPhpCodeFunction('getOptions' . $ucfTableName, '', $getOptions, 'public ', false, "\t");
	505	+ $ret .= $pc->getPhpCodeFunction('getOptions'.$ucfTableName, '', $getOptions, 'public ', false, "\t");
506	506
507	507	return $ret;
508	508	}
		@@ -531,8 +531,8 @@ discard block
		block discarded – undo
531	531	$ucfModuleDirname = ucfirst($moduleDirname);
532	532	$ucfTableName = ucfirst($tableName);
533	533	$ucfTableSoleName = ucfirst($tableSoleName);
534		- $ucfModuleTable = $ucfModuleDirname . $ucfTableName;
535		- $multiLineCom = ['Class Object Handler' => $ucfModuleDirname . $ucfTableName];
	534	+ $ucfModuleTable = $ucfModuleDirname.$ucfTableName;
	535	+ $multiLineCom = ['Class Object Handler' => $ucfModuleDirname.$ucfTableName];
536	536	$ret = $pc->getPhpCodeCommentMultiLine($multiLineCom);
537	537
538	538	$cClh = $pc->getPhpCodeCommentMultiLine(['Constructor' => '', '' => '', '@param' => 'null\|XoopsDatabase $db'], "\t");
		@@ -618,15 +618,15 @@ discard block
		block discarded – undo
618	618	$xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
619	619	$cc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
620	620	$ucfTableName = ucfirst($tableName);
621		- $ret = $pc->getPhpCodeCommentMultiLine(['Get Count ' . $ucfTableName => 'in the database', '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
	621	+ $ret = $pc->getPhpCodeCommentMultiLine(['Get Count '.$ucfTableName => 'in the database', '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
622	622
623		- $critCount = $cc->getClassCriteriaCompo('crCount' . $ucfTableName, "\t\t");
	623	+ $critCount = $cc->getClassCriteriaCompo('crCount'.$ucfTableName, "\t\t");
624	624	$paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crCount{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
625		- $critCount .= $xc->getXcEqualsOperator('$crCount' . $ucfTableName, $paramsCrit, null, false, "\t\t");
	625	+ $critCount .= $xc->getXcEqualsOperator('$crCount'.$ucfTableName, $paramsCrit, null, false, "\t\t");
626	626	$critCount .= $this->getSimpleString("return parent::getCount(\$crCount{$ucfTableName});", "\t\t");
627	627	$params = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
628	628
629		- $ret .= $pc->getPhpCodeFunction('getCount' . $ucfTableName, $params, $critCount, 'public ', false, "\t");
	629	+ $ret .= $pc->getPhpCodeFunction('getCount'.$ucfTableName, $params, $critCount, 'public ', false, "\t");
630	630
631	631	return $ret;
632	632	}
		@@ -646,15 +646,15 @@ discard block
		block discarded – undo
646	646	$xc = Tdmcreate\Files\CreateXoopsCode::getInstance();
647	647	$cc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
648	648	$ucfTableName = ucfirst($tableName);
649		- $ret = $pc->getPhpCodeCommentMultiLine(['Get All ' . $ucfTableName => 'in the database', '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t");
	649	+ $ret = $pc->getPhpCodeCommentMultiLine(['Get All '.$ucfTableName => 'in the database', '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'array'], "\t");
650	650
651		- $critAll = $cc->getClassCriteriaCompo('crAll' . $ucfTableName, "\t\t");
	651	+ $critAll = $cc->getClassCriteriaCompo('crAll'.$ucfTableName, "\t\t");
652	652	$paramsCrit = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
653		- $critAll .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCrit, null, false, "\t\t");
	653	+ $critAll .= $xc->getXcEqualsOperator('$crAll'.$ucfTableName, $paramsCrit, null, false, "\t\t");
654	654	$critAll .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t");
655	655	$params = "\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
656	656
657		- $ret .= $pc->getPhpCodeFunction('getAll' . $ucfTableName, $params, $critAll, 'public ', false, "\t");
	657	+ $ret .= $pc->getPhpCodeFunction('getAll'.$ucfTableName, $params, $critAll, 'public ', false, "\t");
658	658
659	659	return $ret;
660	660	}
		@@ -695,19 +695,19 @@ discard block
		block discarded – undo
695	695	$param2 = "\$GLOBALS['xoopsUser']->getGroups()";
696	696	$param3 = "\$GLOBALS['xoopsModule']->getVar('mid')";
697	697	$critAll .= $xc->getXcGetItemIds($lcfTopicTableName, 'gpermHandler', $param1, $param2, $param3, "\t\t");
698		- $critAll .= $cc->getClassCriteriaCompo('crAll' . $ucfTableName, "\t\t");
	698	+ $critAll .= $cc->getClassCriteriaCompo('crAll'.$ucfTableName, "\t\t");
699	699
700	700	if (false !== mb_strpos($fieldName, 'status')) {
701		- $crit = $cc->getClassCriteria('', "'{$fieldName}'", '0', "'!='", true);
702		- $critAll .= $cc->getClassAdd('crAll' . $ucfTableName, $crit, "\t\t");
	701	+ $crit = $cc->getClassCriteria('', "'{$fieldName}'", '0', "'!='", true);
	702	+ $critAll .= $cc->getClassAdd('crAll'.$ucfTableName, $crit, "\t\t");
703	703	}
704	704	$paramsCritAll = "\$this->get{$ucfTableName}Criteria(\$crAll{$ucfTableName}, \$start, \$limit, \$sort, \$order)";
705		- $critAll .= $xc->getXcEqualsOperator('$crAll' . $ucfTableName, $paramsCritAll, null, false, "\t\t");
	705	+ $critAll .= $xc->getXcEqualsOperator('$crAll'.$ucfTableName, $paramsCritAll, null, false, "\t\t");
706	706
707	707	$critAll .= $this->getSimpleString("return parent::getAll(\$crAll{$ucfTableName});", "\t\t");
708		- $params = "\${$tableFieldName}Id, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
	708	+ $params = "\${$tableFieldName}Id, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC'";
709	709
710		- $ret .= $pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id" . $ucfTableName, $params, $critAll, 'public ', false, "\t");
	710	+ $ret .= $pc->getPhpCodeFunction("getAll{$ucfTableName}By{$fieldNameDesc}Id".$ucfTableName, $params, $critAll, 'public ', false, "\t");
711	711
712	712	return $ret;
713	713	}
		@@ -723,14 +723,14 @@ discard block
		block discarded – undo
723	723	$pc = Tdmcreate\Files\CreatePhpCode::getInstance();
724	724	$cc = Tdmcreate\Files\Classes\ClassXoopsCode::getInstance();
725	725	$ucfTableName = ucfirst($tableName);
726		- $ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria ' . $ucfTableName, '@param ' => "\$cr{$ucfTableName}", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
	726	+ $ret = $pc->getPhpCodeCommentMultiLine(['Get' => 'Criteria '.$ucfTableName, '@param ' => "\$cr{$ucfTableName}", '@param int $start' => '', '@param int $limit' => '', '@param string $sort' => '', '@param string $order' => '', '@return' => 'int'], "\t");
727	727
728	728	$paramsAllCriteria = "\$cr{$ucfTableName}, \$start, \$limit, \$sort, \$order";
729	729
730		- $critSets = $cc->getClassSetStart('cr' . $ucfTableName, 'start', "\t\t");
731		- $critSets .= $cc->getClassSetLimit('cr' . $ucfTableName, 'limit', "\t\t");
732		- $critSets .= $cc->getClassSetSort('cr' . $ucfTableName, 'sort', "\t\t");
733		- $critSets .= $cc->getClassSetOrder('cr' . $ucfTableName, 'order', "\t\t");
	730	+ $critSets = $cc->getClassSetStart('cr'.$ucfTableName, 'start', "\t\t");
	731	+ $critSets .= $cc->getClassSetLimit('cr'.$ucfTableName, 'limit', "\t\t");
	732	+ $critSets .= $cc->getClassSetSort('cr'.$ucfTableName, 'sort', "\t\t");
	733	+ $critSets .= $cc->getClassSetOrder('cr'.$ucfTableName, 'order', "\t\t");
734	734	$critSets .= $this->getSimpleString("return \$cr{$ucfTableName};", "\t\t");
735	735
736	736	$ret .= $pc->getPhpCodeFunction("get{$ucfTableName}Criteria", $paramsAllCriteria, $critSets, 'private ', false, "\t");
		@@ -755,9 +755,9 @@ discard block
		block discarded – undo
755	755	$tableSoleName = $table->getVar('table_solename');
756	756	$ucfTableSoleName = ucfirst($tableSoleName);
757	757	$ccTableSoleName = $this->getCamelCase($tableSoleName, true);
758		- $ret = $pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName . ' from id', '' => '', '@return' => 'string'], "\t");
	758	+ $ret = $pc->getPhpCodeCommentMultiLine(['Returns the' => $ucfTableSoleName.' from id', '' => '', '@return' => 'string'], "\t");
759	759	$soleName = $xc->getXcEqualsOperator("\${$tableSoleName}Id", "(int)( \${$tableSoleName}Id )", null, false, "\t\t");
760		- $soleName .= $xc->getXcEqualsOperator("\${$tableSoleName}", "''", null, false, "\t\t");
	760	+ $soleName .= $xc->getXcEqualsOperator("\${$tableSoleName}", "''", null, false, "\t\t");
761	761
762	762	$contentIf = $xc->getXoopsHandlerLine($moduleDirname, $tableName, "\t\t\t");
763	763	$contentIf .= $xc->getXcGet($tableName, "\${$tableSoleName}Id", 'Obj', true, false, "\t\t\t");

		@@ -75,8 +75,8 @@ discard block
		block discarded – undo
75	75	*/
76	76	public function getClassCriteria($var, $param1, $param2 = '', $param3 = '', $isParam = false, $t = '')
77	77	{
78		- $params = ('' != $param2) ? ', ' . $param2 : '';
79		- $params .= ('' != $param3) ? ', ' . $param3 : '';
	78	+ $params = ('' != $param2) ? ', '.$param2 : '';
	79	+ $params .= ('' != $param3) ? ', '.$param3 : '';
80	80
81	81	if (false === $isParam) {
82	82	$ret = "{$t}\${$var} = new \Criteria( {$param1}{$params} );\n";
		@@ -279,7 +279,7 @@ discard block
		block discarded – undo
279	279	*/
280	280	public function getClassXoopsFormLabel($var, $param1 = '', $param2 = null, $isParam = false, $t = "\t\t", $useParam = false)
281	281	{
282		- $label = 'new \XoopsFormLabel(';
	282	+ $label = 'new \XoopsFormLabel(';
283	283	if (false === $useParam) {
284	284	$params = null != $param2 ? "{$param1}, {$param2}" : $param1;
285	285	} else {

txmodxoops / tdmcreate

Pull Request — master (#146)

Status

Category

Spacing +43 added lines, -43 removed lines patch added patch discarded remove patch

Spacing +37 added lines, -37 removed lines patch added patch discarded remove patch

Spacing +71 added lines, -71 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch