Merge pull request #2 from mambax7/master

updates

.gitattributes

@@ -5,13 +5,13 @@
 *.cs     diff=csharp
 
 # Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
+*.doc     diff=astextplain
+*.DOC     diff=astextplain
 *.docx diff=astextplain
 *.DOCX diff=astextplain
 *.dot  diff=astextplain
 *.DOT  diff=astextplain
 *.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+*.PDF     diff=astextplain
+*.rtf     diff=astextplain
+*.RTF     diff=astextplain

.scrutinizer.yml

@@ -1,50 +1,23 @@
-checks:
+# language: php
+build:
+  nodes:
+    tests: true
+    analysis:
+      dependencies:
+        after:
+          # The following installs the most recent XOOPS CMS version, you might want
+          # to install a specific release tag or branch instead.
+          - git clone --depth=1 https://github.com/XOOPS/XoopsCore25
+          - git clone --depth=1 https://github.com/mambax7/tag
+      project_setup:
+        override: true
+      tests:
+        override:
+          - php-scrutinizer-run --enable-security-analysis
+  environment:
     php:
-        code_rating: true
-        variable_existence: true
-        useless_calls: true
-        use_statement_alias_conflict: true
-        unused_variables: true
-        unused_properties: true
-        unused_parameters: true
-        unused_methods: true
-        unreachable_code: true
-        sql_injection_vulnerabilities: true
-        security_vulnerabilities: true
-        precedence_mistakes: true
-        precedence_in_conditions: true
-        parameter_non_unique: true
-        no_property_on_interface: true
-        no_non_implemented_abstract_methods: true
-        deprecated_code_usage: true
-        closure_use_not_conflicting: true
-        closure_use_modifiable: true
-        avoid_useless_overridden_methods: true
-        avoid_conflicting_incrementers: true
-        assignment_of_null_return: true
-        verify_property_names: true
-        verify_argument_usable_as_reference: true
-        verify_access_scope_valid: true
-        use_self_instead_of_fqcn: true
-        too_many_arguments: true
-        single_namespace_per_use: true
-        return_doc_comment_if_not_inferrable: true
-        return_doc_comments: true
-        require_scope_for_methods: true
-        require_scope_for_properties: true
-        require_php_tag_first: true
-        require_braces_around_control_structures: true
-        psr2_control_structure_declaration: true
-        psr2_switch_declaration: true
-        psr2_class_declaration: true
-        no_eval: true
-        no_else_if_statements: true
-        avoid_corrupting_byteorder_marks: true
-        argument_type_checks: true
-        php5_style_constructor: true
-        parameter_doc_comments: true
-        no_duplicate_arguments: true
-        missing_arguments: true
-        instanceof_class_exists: true
-        foreach_traversable: true
-        no_unnecessary_function_call_in_for_loop: true
+      version: "7.2"
+filter:
+  dependency_paths:
+    - XoopsCore25/*
+    - tag/*

CONTRIBUTING.md

@@ -0,0 +1,20 @@
+![alt XOOPS CMS](https://xoops.org/images/logoXoops4GithubRepository.png)
+# Contributing to [XOOPS CMS](https://xoops.org)
+[![XOOPS CMS Module](https://img.shields.io/badge/XOOPS%20CMS-Module-blue.svg)](https://xoops.org)
+[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](https://www.gnu.org/licenses/gpl-2.0.html)
+
+Contributions are **welcome** and will be fully **credited**.
+
+We accept contributions via Pull Requests on [Github](https://github.com/XoopsModules25x/xforms).
+
+## Pull Requests
+
+- **[PSR-12 Coding Standard](https://www.php-fig.org/psr/psr-12/)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).
+- **Add tests!** - We encourage providing tests for your contributions.
+- **Document any change in behavior** - Make sure the `/docs/changelog.txt` and any other relevant documentation are up-to-date.
+- **Consider our release cycle** - We try to follow [Semantic Versioning v2.0.0](http://semver.org/). Randomly breaking public APIs is not an option.
+- **Create feature branches** - Don't ask us to pull from your master branch.
+- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
+- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting.
+
+Happy coding, and **_May the Source be with You_**!

README.md

@@ -1,4 +1,23 @@
-#xForms
-[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE) 
+![alt XOOPS CMS](https://xoops.org/images/logoXoopsPhp8.png)
+## xForms module for [XOOPS CMS 2.5.10+](https://xoops.org)
+[![XOOPS CMS Module](https://img.shields.io/badge/XOOPS%20CMS-Module-blue.svg)](https://xoops.org)
+[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](https://www.gnu.org/licenses/gpl-2.0.html)
 
-xForms is a module for XOOPS that offers widely customizable contact forms. xForms generates different kind of form elements e.g. text areas, check boxes for webmasters to create their custom "Contact Us" forms.
+[![Latest Pre-Release](https://img.shields.io/github/tag/XoopsModules25x/xforms.svg?style=flat)](https://github.com/XoopsModules25x/xforms/tags/)
+[![Latest Version](https://img.shields.io/github/release/XoopsModules25x/xforms.svg?style=flat)](https://github.com/XoopsModules25x/xforms/releases/)
+
+### Description
+**xForms** is a module for XOOPS that offers widely customizable forms. xForms generates different kind of form elements\ e.g. text areas, check boxes for webmasters to create custom forms like "Contact Us", questionnaires, surveys, quiz forms,\ registration forms, quote request forms, etc.
+
+Results can be stored in the database and emailed if desired.
+
+A form import utility is provided to ease transition from previous XOOPS forms modules (Liaise and eForms).
+
+[![Tutorial Available](https://xoops.org/images/tutorial-available-blue.svg)](https://xoops.gitbook.io/xforms-tutorial/) Tutorial: see [GitBook](https://xoops.gitbook.io/xforms-tutorial/).
+To contribute to the Tutorial, [fork it on GitHub](https://github.com/XoopsDocs/xforms-tutorial)
+
+[![Translations on Transifex](https://xoops.org/images/translations-transifex-blue.svg)](https://www.transifex.com/xoops)
+
+Please visit us on https://xoops.org
+
+Current and upcoming "next generation" versions of XOOPS CMS are crafted on GitHub at: https://github.com/XOOPS

admin/about.php

@@ -1,30 +1,30 @@
 <?php
 /*
- 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
- which is considered copyrighted (c) material of the original comment or credit authors.
+ 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
+ which is considered copyrighted (c) material of the original comment or credit
+ authors.
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
+
 /**
- * xForms module
+ * Module: xForms
+ * Admin About file
  *
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package         xforms
+ * @package         \XoopsModules\Xforms\admin
+ * @author          XOOPS Module Development Team
+ * @copyright       Copyright (c) 2001-2020 {@link https://xoops.org XOOPS Project}
+ * @license         https://www.gnu.org/licenses/gpl-2.0.html GNU Public License
  * @since           1.30
- * @author          Xoops Development Team
  */
-
-include_once __DIR__ . '/admin_header.php';
-
+require_once __DIR__ . '/admin_header.php';
 xoops_cp_header();
+/* @var \Xmf\Module\Admin $adminObject */
+$adminObject->displayNavigation(basename(__FILE__));
+$adminObject::setPaypal('[email protected]');
+$adminObject->displayAbout(false);
 
-$aboutAdmin = new ModuleAdmin();
-
-echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderAbout('', true);
-
-include __DIR__ . '/admin_footer.php';
+require_once __DIR__ . '/admin_footer.php';

admin/admin_footer.php

@@ -1,31 +1,30 @@
 <?php
 /*
- 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
- which is considered copyrighted (c) material of the original comment or credit authors.
+ 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
+ which is considered copyrighted (c) material of the original comment or credit
+ authors.
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
+
 /**
- * xForms module
+ * Module: xForms
+ * Admin footer file
  *
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package         xforms
+ * @package         \XoopsModules\Xforms\admin
+ * @author          XOOPS Module Development Team
+ * @copyright       Copyright (c) 2001-2020 {@link https://xoops.org XOOPS Project}
+ * @license         https://www.gnu.org/licenses/gpl-2.0.html GNU Public License
  * @since           1.30
- * @author          Xoops Development Team
+ *
+ * @see             \Xmf\Module\Admin
  */
 
-global $xoopsModule;
-$pathIcon32      = '../' . $xoopsModule->getInfo('icons32');
+use Xmf\Module\Admin;
 
-echo "<div class='adminfooter'>\n"
-    ."  <div style='text-align: center;'>\n"
-    ."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
-    ."  </div>\n"
-    ."  " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
-    ."</div>";
+echo '<div class="adminfooter">' . '<div class="center">' . '  <a href="https://xoops.org" rel="noopener external" target="_blank"><img src="' . Admin::iconUrl('xoopsmicrobutton.gif') . '" ' . 'alt="XOOPS" title="XOOPS"></a>' . '</div>' . _AM_MODULEADMIN_ADMIN_FOOTER . '</div>';
 
 xoops_cp_footer();

admin/admin_header.php

@@ -1,48 +1,53 @@
 <?php
 /*
- 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
- which is considered copyrighted (c) material of the original comment or credit authors.
+ 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
+ which is considered copyrighted (c) material of the original comment or credit
+ authors.
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
+
 /**
- * xForms module
+ * Module: xForms
+ * Admin header file
+ *
+ * @package   \XoopsModules\Xforms\admin
+ * @author    XOOPS Module Development Team
+ * @copyright Copyright (c) 2001-2020 {@link https://xoops.org XOOPS Project}
+ * @license   https://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @link      https://github.com/XoopsModules25x/xforms
  *
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package         xforms
- * @since           1.30
- * @author          Xoops Development Team
+ * @see \Xmf\Module\Helper
+ * @see \Xmf\Module\Admin
  */
 
-include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-require_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+use Xmf\Module\Admin;
+use XoopsModules\Xforms\Helper;
 
-include dirname(__DIR__) .'/include/common.php';
-define('XFORMS_ADMIN_URL', XFORMS_URL . '/admin/main.php');
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once dirname(__DIR__, 3) . '/include/cp_header.php';
+require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+require $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
+require_once dirname(__DIR__) . '/include/common.php';
 
-global $xoopsModule;
+$moduleDirName = basename(dirname(__DIR__));
 
-$thisModuleDir = XFORMS_DIRNAME;
-
-//if functions.php file exist
-require_once dirname(__DIR__) . '/include/functions.php';
+/**
+ * @var \Xmf\Module\Admin $adminObject
+ * @var \XoopsModules\Xforms\Helper $helper
+ * @var \XoopsModules\Xforms\FormsHandler $formsHandler
+ */
+$adminObject  = Admin::getInstance();
+$helper       = Helper::getInstance();
+$formsHandler = $helper->getHandler('Forms');
 
 // Load language files
-xoops_loadLanguage('admin', XFORMS_DIRNAME);
-xoops_loadLanguage('modinfo', XFORMS_DIRNAME);
-xoops_loadLanguage('main', XFORMS_DIRNAME);
-
-$pathIcon16      = '../' . $xoopsModule->getInfo('icons16');
-$pathIcon32      = '../' . $xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-
-$mypathIcon16 = XOOPS_URL . '/modules/' . $thisModuleDir . '/assets/images/icons/16';
-//$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$helper->loadLanguage('admin');
+$helper->loadLanguage('modinfo');
+$helper->loadLanguage('main');
+$helper->loadLanguage('common');
 
-include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+// Load/Instantiate form classes
+//xoops_load('xoopsformloader');