From 2eff92fbedd67962ef883f70bf99854592e04e0c Mon Sep 17 00:00:00 2001 From: HermanPeeren Date: Sat, 20 Sep 2025 10:01:12 +0200 Subject: [PATCH] Added check for -JEXEC (and escape for phpcs) --- .../com_ccm/src/Controller/CmsController.php | 5 ++++ .../com_ccm/src/Controller/CmssController.php | 4 ++- .../src/Controller/DisplayController.php | 7 ++++- .../src/Controller/MigrationController.php | 4 +++ .../com_ccm/src/Extension/CCMComponent.php | 4 ++- .../com_ccm/src/Fields/CcmField.php | 9 ++++-- .../com_ccm/src/Fields/CmsField.php | 7 +++-- .../com_ccm/src/Fields/CmsObjTypeField.php | 7 +++-- .../com_ccm/src/Helper/MigrationHelper.php | 4 +++ .../components/com_ccm/src/Model/CmsModel.php | 2 ++ .../com_ccm/src/Model/CmssModel.php | 2 ++ .../com_ccm/src/Model/MigrationModel.php | 4 +++ .../components/com_ccm/src/Service/Router.php | 4 ++- .../components/com_ccm/src/Table/CmsTable.php | 4 ++- .../com_ccm/src/View/Cms/HtmlView.php | 4 ++- .../com_ccm/src/View/Cmss/HtmlView.php | 4 ++- .../com_ccm/src/View/Migration/HtmlView.php | 6 ++-- .../components/com_ccm/tmpl/cms/edit.php | 28 ++++++++++--------- .../components/com_ccm/tmpl/cmss/default.php | 5 ++-- .../com_ccm/tmpl/migration/default.php | 1 + 20 files changed, 83 insertions(+), 32 deletions(-) diff --git a/src/administrator/components/com_ccm/src/Controller/CmsController.php b/src/administrator/components/com_ccm/src/Controller/CmsController.php index bf0e1b0..5a3299c 100644 --- a/src/administrator/components/com_ccm/src/Controller/CmsController.php +++ b/src/administrator/components/com_ccm/src/Controller/CmsController.php @@ -8,6 +8,11 @@ */ namespace Joomla\Component\CCM\Administrator\Controller; + +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + use Joomla\CMS\MVC\Controller\FormController; class CmsController extends FormController { diff --git a/src/administrator/components/com_ccm/src/Controller/CmssController.php b/src/administrator/components/com_ccm/src/Controller/CmssController.php index 00ba40c..fb6b0ad 100644 --- a/src/administrator/components/com_ccm/src/Controller/CmssController.php +++ b/src/administrator/components/com_ccm/src/Controller/CmssController.php @@ -9,7 +9,9 @@ namespace Joomla\Component\CCM\Administrator\Controller; -defined('_JEXEC') or die; +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects use Joomla\CMS\MVC\Controller\ListController; use Joomla\CMS\Router\Route as JRoute; diff --git a/src/administrator/components/com_ccm/src/Controller/DisplayController.php b/src/administrator/components/com_ccm/src/Controller/DisplayController.php index 076abd2..ac1d800 100644 --- a/src/administrator/components/com_ccm/src/Controller/DisplayController.php +++ b/src/administrator/components/com_ccm/src/Controller/DisplayController.php @@ -7,8 +7,13 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ -// first file the Joomla! MVC checks after the component bootup + namespace Joomla\Component\CCM\Administrator\Controller; + +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + use Joomla\CMS\MVC\Controller\BaseController; class DisplayController extends BaseController diff --git a/src/administrator/components/com_ccm/src/Controller/MigrationController.php b/src/administrator/components/com_ccm/src/Controller/MigrationController.php index e87b33f..39475a5 100644 --- a/src/administrator/components/com_ccm/src/Controller/MigrationController.php +++ b/src/administrator/components/com_ccm/src/Controller/MigrationController.php @@ -9,6 +9,10 @@ namespace Joomla\Component\CCM\Administrator\Controller; +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + use Joomla\CMS\MVC\Controller\BaseController; class MigrationController extends BaseController diff --git a/src/administrator/components/com_ccm/src/Extension/CCMComponent.php b/src/administrator/components/com_ccm/src/Extension/CCMComponent.php index ac5939b..8297ed3 100644 --- a/src/administrator/components/com_ccm/src/Extension/CCMComponent.php +++ b/src/administrator/components/com_ccm/src/Extension/CCMComponent.php @@ -9,7 +9,9 @@ namespace Joomla\Component\CCM\Administrator\Extension; -defined('_JEXEC') or die; +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects use Joomla\CMS\Extension\BootableExtensionInterface; use Joomla\CMS\Extension\MVCComponent; diff --git a/src/administrator/components/com_ccm/src/Fields/CcmField.php b/src/administrator/components/com_ccm/src/Fields/CcmField.php index 472f5c4..fc159da 100644 --- a/src/administrator/components/com_ccm/src/Fields/CcmField.php +++ b/src/administrator/components/com_ccm/src/Fields/CcmField.php @@ -8,14 +8,17 @@ */ namespace Joomla\Component\CCM\Administrator\Fields; + +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + use Joomla\CMS\Factory; use Joomla\CMS\Form\Field\ListField; -// content in wordpress & text in joomla +// content in WordPress & text in Joomla // what if data is null (e.g. image), then I can't get its type -// prefixed the name of our field with our company name. -// This helps prevent clashes with other field types defined by other developers. class CcmField extends ListField { // define a custom form field // the name of the type for our new field diff --git a/src/administrator/components/com_ccm/src/Fields/CmsField.php b/src/administrator/components/com_ccm/src/Fields/CmsField.php index a5a5afc..d2b3785 100644 --- a/src/administrator/components/com_ccm/src/Fields/CmsField.php +++ b/src/administrator/components/com_ccm/src/Fields/CmsField.php @@ -8,10 +8,13 @@ */ namespace Joomla\Component\CCM\Administrator\Fields; + +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + use Joomla\CMS\Form\Field\ListField; -// prefixed the name of our field with our company name. -// This helps prevent clashes with other field types defined by other developers. class CmsField extends ListField { // this should be named CmsNameField // define a custom form field // the name of the type for our new field diff --git a/src/administrator/components/com_ccm/src/Fields/CmsObjTypeField.php b/src/administrator/components/com_ccm/src/Fields/CmsObjTypeField.php index eb5d5ff..f8e1c86 100644 --- a/src/administrator/components/com_ccm/src/Fields/CmsObjTypeField.php +++ b/src/administrator/components/com_ccm/src/Fields/CmsObjTypeField.php @@ -8,10 +8,13 @@ */ namespace Joomla\Component\CCM\Administrator\Fields; + +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + use Joomla\CMS\Form\Field\ListField; -// prefixed the name of our field with our company name. -// This helps prevent clashes with other field types defined by other developers. class CmsObjTypeField extends ListField { // define a custom form field // the name of the type for our new field diff --git a/src/administrator/components/com_ccm/src/Helper/MigrationHelper.php b/src/administrator/components/com_ccm/src/Helper/MigrationHelper.php index 44d6321..99473fe 100644 --- a/src/administrator/components/com_ccm/src/Helper/MigrationHelper.php +++ b/src/administrator/components/com_ccm/src/Helper/MigrationHelper.php @@ -9,6 +9,10 @@ namespace Joomla\Component\CCM\Administrator\Helper; +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + use Joomla\CMS\Http\HttpFactory; /** diff --git a/src/administrator/components/com_ccm/src/Model/CmsModel.php b/src/administrator/components/com_ccm/src/Model/CmsModel.php index 1dda7d8..a1e10d5 100644 --- a/src/administrator/components/com_ccm/src/Model/CmsModel.php +++ b/src/administrator/components/com_ccm/src/Model/CmsModel.php @@ -13,7 +13,9 @@ use Joomla\CMS\Http\HttpFactory; use Joomla\CMS\MVC\Model\AdminModel; +// phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects //cms type = wordpress, joomla, drupal, etc. //their APIs diff --git a/src/administrator/components/com_ccm/src/Model/CmssModel.php b/src/administrator/components/com_ccm/src/Model/CmssModel.php index 7eca228..f682633 100644 --- a/src/administrator/components/com_ccm/src/Model/CmssModel.php +++ b/src/administrator/components/com_ccm/src/Model/CmssModel.php @@ -14,7 +14,9 @@ use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\MVC\Model\ListModel; +// phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects class CmssModel extends ListModel { diff --git a/src/administrator/components/com_ccm/src/Model/MigrationModel.php b/src/administrator/components/com_ccm/src/Model/MigrationModel.php index 832c269..d1f3535 100644 --- a/src/administrator/components/com_ccm/src/Model/MigrationModel.php +++ b/src/administrator/components/com_ccm/src/Model/MigrationModel.php @@ -9,6 +9,10 @@ namespace Joomla\Component\CCM\Administrator\Model; +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + use Joomla\CMS\Factory; use Joomla\CMS\Filter\OutputFilter; use Joomla\CMS\Http\Http; diff --git a/src/administrator/components/com_ccm/src/Service/Router.php b/src/administrator/components/com_ccm/src/Service/Router.php index c13f76e..4b4b8bf 100644 --- a/src/administrator/components/com_ccm/src/Service/Router.php +++ b/src/administrator/components/com_ccm/src/Service/Router.php @@ -9,7 +9,9 @@ namespace Joomla\Component\CCM\Administrator\Service; -defined('_JEXEC') or die; +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects use Joomla\CMS\Router\ApiRouter; use Joomla\CMS\Router\Route; diff --git a/src/administrator/components/com_ccm/src/Table/CmsTable.php b/src/administrator/components/com_ccm/src/Table/CmsTable.php index fbf4454..c8f3003 100644 --- a/src/administrator/components/com_ccm/src/Table/CmsTable.php +++ b/src/administrator/components/com_ccm/src/Table/CmsTable.php @@ -9,7 +9,9 @@ namespace Joomla\Component\CCM\Administrator\Table; -defined('_JEXEC') or die; +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects use Joomla\CMS\Table\Table; use Joomla\Database\DatabaseInterface; diff --git a/src/administrator/components/com_ccm/src/View/Cms/HtmlView.php b/src/administrator/components/com_ccm/src/View/Cms/HtmlView.php index 0041d28..ee2649f 100644 --- a/src/administrator/components/com_ccm/src/View/Cms/HtmlView.php +++ b/src/administrator/components/com_ccm/src/View/Cms/HtmlView.php @@ -9,7 +9,9 @@ namespace Joomla\Component\CCM\Administrator\View\Cms; -defined('_JEXEC') or die; +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects use Joomla\CMS\Factory; use Joomla\CMS\Helper\ContentHelper; diff --git a/src/administrator/components/com_ccm/src/View/Cmss/HtmlView.php b/src/administrator/components/com_ccm/src/View/Cmss/HtmlView.php index 57b3f76..ea57a48 100644 --- a/src/administrator/components/com_ccm/src/View/Cmss/HtmlView.php +++ b/src/administrator/components/com_ccm/src/View/Cmss/HtmlView.php @@ -9,7 +9,9 @@ namespace Joomla\Component\CCM\Administrator\View\Cmss; -defined('_JEXEC') or die; +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; diff --git a/src/administrator/components/com_ccm/src/View/Migration/HtmlView.php b/src/administrator/components/com_ccm/src/View/Migration/HtmlView.php index 8503628..21916b3 100644 --- a/src/administrator/components/com_ccm/src/View/Migration/HtmlView.php +++ b/src/administrator/components/com_ccm/src/View/Migration/HtmlView.php @@ -9,7 +9,9 @@ namespace Joomla\Component\CCM\Administrator\View\Migration; -defined('_JEXEC') or die; +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects use Joomla\CMS\Language\Text; use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; @@ -35,7 +37,7 @@ public function display($tpl = null): void // TODO // after each step say echo "Mapping is done" --> then echo "Migration is done" - // this can be added in js in frontend in mdeia folder + // this can be added in js in frontend in media folder // from webassets parent::display($tpl); } diff --git a/src/administrator/components/com_ccm/tmpl/cms/edit.php b/src/administrator/components/com_ccm/tmpl/cms/edit.php index b019071..63cdd94 100644 --- a/src/administrator/components/com_ccm/tmpl/cms/edit.php +++ b/src/administrator/components/com_ccm/tmpl/cms/edit.php @@ -7,6 +7,8 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Router\Route; @@ -17,19 +19,19 @@ ?>
-    
-        
-            
-                
-                    
-                        form->getFieldset() as $field) :?> +
+
+
+
+
+ form->getFieldset() as $field) :?> renderField(); ?> -                    
-                
-            
-        
-    
-     -     +
+
+
+
+
+ +
diff --git a/src/administrator/components/com_ccm/tmpl/cmss/default.php b/src/administrator/components/com_ccm/tmpl/cmss/default.php index 847eabf..be6f8c5 100644 --- a/src/administrator/components/com_ccm/tmpl/cmss/default.php +++ b/src/administrator/components/com_ccm/tmpl/cmss/default.php @@ -7,13 +7,13 @@ * @license GNU General Public License version 2 or later; see LICENSE.txt */ +defined('_JEXEC') or die; + use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; use Joomla\CMS\Router\Route; -defined('_JEXEC') or die; - $listDirn = $this->escape($this->state->get('list.direction')); $listOrder = $this->escape($this->state->get('list.ordering')); @@ -21,7 +21,6 @@ $wa = $this->getDocument()->getWebAssetManager(); $wa->useScript('table.columns') ->useScript('multiselect'); - ?>
diff --git a/src/administrator/components/com_ccm/tmpl/migration/default.php b/src/administrator/components/com_ccm/tmpl/migration/default.php index ddd3df9..1c43354 100644 --- a/src/administrator/components/com_ccm/tmpl/migration/default.php +++ b/src/administrator/components/com_ccm/tmpl/migration/default.php @@ -8,6 +8,7 @@ */ defined('_JEXEC') or die; + use Joomla\CMS\HTML\HTMLHelper; use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route;