Merge pull request #16 from ggoffy/master

- added check quality/inconsistences of module data before building

Author: ggoffy

_TODO.txt

@@ -11,22 +11,17 @@ TODOs:
 
 new xoops_confirm
 
-catch error when notification selected but no status field exists
 
-Broken files:
-Notification for broken files in xoops_version adapt?
-add initiate event when click on broken file
+rate.php:
+this file currently is not rating
 
 
-Notifications:
-there are too much notification, which are not needed/working
-- reduce xoops_version.php to needed
-- adapt language/modinfo.php (make nice text of e.g.: Global newcategory notify caption)
 
 
-rate.php:
-this file currently is not rating
 
+Permissions:
+check handling for different groups
+implement autoapprove
 
 
 

admin/building.php

@@ -1,7 +1,5 @@
 <?php
 
-use XoopsModules\Modulebuilder;
-
 /*
  You may not change or alter any portion of this comment or credits
  of supporting developers from this source code or any supporting source code
@@ -23,17 +21,21 @@
  *
  */
 
+use XoopsModules\Modulebuilder;
+use XoopsModules\Modulebuilder\Files;
 use Xmf\Request;
 
 $templateMain = 'modulebuilder_building.tpl';
 
 include __DIR__ . '/header.php';
-$op               = Request::getString('op', 'default');
-$mid              = Request::getInt('mod_id');
-$inroot_copy      = Request::getInt('inroot_copy');
-$testdata_restore = Request::getInt('testdata_restore');
-$moduleObj        = $helper->getHandler('Modules')->get($mid);
-$cachePath        = XOOPS_VAR_PATH . '/caches/modulebuilder_cache';
+$op              = Request::getString('op', 'default');
+$mid             = Request::getInt('mod_id');
+$inrootCopy      = Request::getInt('inroot_copy');
+$testdataRestore = Request::getInt('testdata_restore');
+$checkData       = Request::hasVar('check_data');
+$moduleObj       = $helper->getHandler('Modules')->get($mid);
+
+$cachePath       = XOOPS_VAR_PATH . '/caches/modulebuilder_cache_';
 if (!is_dir($cachePath)) {
     if (!mkdir($cachePath, 0777) && !is_dir($cachePath)) {
         throw new \RuntimeException(sprintf('Directory "%s" was not created', $cachePath));
@@ -47,16 +49,40 @@
 if (!file_exists($indexFile = $cachePath . '/index.html')) {
     copy('index.html', $indexFile);
 }
+
+if ($checkData > 0) {
+    $op = 'check_data';
+}
 // Switch option
 switch ($op) {
+    case 'check_data':
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('building.php'));
+        $GLOBALS['xoopsTpl']->assign('modPathIcon16', TDMC_URL . '/' . $modPathIcon16);
+        $checkdata    = Modulebuilder\Files\CheckData::getInstance();
+
+        // check data for inconsistences
+        $checkResults = [];
+        $checkResults = $checkdata->getCheckPreBuilding($moduleObj);
+
+        if (count($checkResults) > 0) {
+            //$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('building.php'));
+            $GLOBALS['xoopsTpl']->assign('checkResults', $checkResults);
+        } else {
+            $GLOBALS['xoopsTpl']->assign('checkResultsNice', true);
+        }
+
+        break;
     case 'build':
         $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('building.php'));
         $building     = Modulebuilder\Building::getInstance();
         $structure    = Modulebuilder\Files\CreateStructure::getInstance();
         $architecture = Modulebuilder\Files\CreateArchitecture::getInstance();
+        $checkdata    = Modulebuilder\Files\CheckData::getInstance();
         // Get var module dirname
         $moduleDirname = $moduleObj->getVar('mod_dirname');
-        if (1 === $testdata_restore) {
+
+        //save test data of selected module before building new version
+        if (1 === $testdataRestore) {
             // Directories for copy from
             $fromDir   = XOOPS_ROOT_PATH . '/modules/' . mb_strtolower($moduleDirname) . '/testdata';
             if (is_dir($fromDir)) {
@@ -71,7 +97,7 @@
                 }
                 $building->copyDir($fromDir, $toDir);
             } else {
-                $testdata_restore = 0;
+                $testdataRestore = 0;
             }
         }
 
@@ -115,7 +141,7 @@
 		$building_directory = sprintf(_AM_MODULEBUILDER_BUILDING_DIRECTORY, $moduleDirname);
 
         // Copy this module in root modules
-        if (1 === $inroot_copy) {
+        if (1 === $inrootCopy) {
             if (isset($moduleDirname)) {
                 // Clear this module if it's in root/modules
                 // Warning: If you have an older operating module with the same name,
@@ -128,11 +154,16 @@
             $building->copyDir($fromDir, $toDir);
 			$building_directory .= sprintf(_AM_MODULEBUILDER_BUILDING_DIRECTORY_INROOT, $toDir);
         }
-        if (1 === $testdata_restore) {
+        if (1 === $testdataRestore) {
             // Directories for copy from to
             $fromDir = TDMC_UPLOAD_TEMP_PATH . '/' . mb_strtolower($moduleDirname) . '/testdata';
             $toDir   = XOOPS_ROOT_PATH . '/modules/' . mb_strtolower($moduleDirname) . '/testdata';
-            $building->copyDir($fromDir, $toDir);
+            if (is_dir($toDir)) {
+                $building->clearDir($toDir);
+            }
+            if (is_dir($fromDir)) {
+                $building->copyDir($fromDir, $toDir);
+            }
         }
 
         $GLOBALS['xoopsTpl']->assign('building_directory', $building_directory);

assets/images/icons/16/error.png

@@ -69,12 +69,15 @@ public function getForm($action = false)
             $mod_select->addOption($mod->getVar('mod_id'), $mod->getVar('mod_name'));
         }
         $form->addElement($mod_select, true);
-        
+
         $form->addElement(new \XoopsFormRadioYN(_AM_MODULEBUILDER_MODULE_INROOT_COPY, 'inroot_copy', $helper->getConfig('inroot_copy')));
         $form->addElement(new \XoopsFormRadioYN(_AM_MODULEBUILDER_ADMIN_BUILD_TEST . _AM_MODULEBUILDER_ADMIN_BUILD_TEST_DESC, 'testdata_restore', 0));
 
         $form->addElement(new \XoopsFormHidden('op', 'build'));
-        $form->addElement(new \XoopsFormButton(_REQUIRED . ' <sup class="red bold">*</sup>', 'submit', _SUBMIT, 'submit'));
+        $btnTray = new \XoopsFormElementTray(_REQUIRED . ' <sup class="red bold">*</sup>', '&nbsp;');
+        $btnTray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+        $btnTray->addElement(new \XoopsFormButton('', 'check_data', _AM_MODULEBUILDER_ADMIN_BUILD_CHECK, 'submit'));
+        $form->addElement($btnTray);
 
         return $form;
     }

assets/images/icons/16/warning.png

@@ -77,7 +77,7 @@ public function geCssSelector($selector, $content, $t)
         } else {
             $ret .= $content . ';';
         }
-        $ret = '}';
+        $ret .= '}';
 
         return $ret;
     }

class/Building.php

@@ -176,7 +176,7 @@ public function render()
         $filename      = $this->getFileName();
         $moduleDirname = $module->getVar('mod_dirname');
         $content       = $this->getHeaderFilesComments($module);
-        $content       = $this->getJavascriptJQueryButtons();
+        $content       .= $this->getJavascriptJQueryButtons();
         $content       .= $this->getJavascriptJQueryPrint();
 
         $this->create($moduleDirname, 'assets/js', $filename, $content, _AM_MODULEBUILDER_FILE_CREATED, _AM_MODULEBUILDER_FILE_NOTCREATED);