Merge pull request #149 from mambax7/master

fix menu

Author: mambax7

admin/menu.php

@@ -91,7 +91,7 @@
     'icon'  => $pathIcon32 . 'mail_foward.png',
 ];
 
-if ($helper->getConfig('displayDeveloperTools')) {
+if (is_object($helper->getModule()) && $helper->getConfig('displayDeveloperTools')) {
     $adminmenu[] = [
         'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE'),
         'link'  => 'admin/migrate.php',

class/Fields.php

@@ -228,7 +228,7 @@ private function getFormNewLine($form, $class, $i, $fieldMid, $fieldTid, $fName,
         $fieldAttributesSelect->addOptionArray($helper->getHandler('Fieldattributes')->getList());
         $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>'));
         // Field Null
-        $value           = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '2';
+        $value           = (1 == $i && 1 == $tableAutoincrement) ? '2' : '2';
         $fieldNullSelect = new \XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value);
         $fieldNullSelect->addOptionArray($helper->getHandler('Fieldnull')->getList());
         $form->addElement(new Tdmcreate\Html\FormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>'));

class/Settings.php

@@ -202,6 +202,7 @@ public function getFormSettings($action = false)
         $imgtray->addElement($fileseltray);
         $form->addElement($imgtray);
 
+
         $form->addElement(new \XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR_MAIL, 'set_author_mail', 50, 255, $this->getVar('set_author_mail')));
         $form->addElement(new \XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR_WEBSITE_URL, 'set_author_website_url', 50, 255, $this->getVar('set_author_website_url')));
         $form->addElement(new \XoopsFormText(_AM_TDMCREATE_SETTING_AUTHOR_WEBSITE_NAME, 'set_author_website_name', 50, 255, $this->getVar('set_author_website_name')));

testdata/index.php

@@ -69,10 +69,11 @@ function loadSampleData()
 
     foreach ($tables as $table) {
         $tabledata = \Xmf\Yaml::readWrapped($language . $table . '.yml');
+        if (is_array($tabledata)) {
         \Xmf\Database\TableLoad::truncateTable($table);
         \Xmf\Database\TableLoad::loadTableFromArray($table, $tabledata);
     }
-
+}
     //  ---  COPY test folder files ---------------
     if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
         //        $file = __DIR__ . '/../testdata/images/';
@@ -96,7 +97,12 @@ function saveSampleData()
 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
-    $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
+    $language = 'english/';
+    if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
+        $language = $xoopsConfig['language'] . '/';
+    }
+
+    $languageFolder = __DIR__ . '/' . $language;
     if (!file_exists($languageFolder . '/')) {
        Utility::createFolder($languageFolder . '/');
     }