REDCORE-588 ready for J4

component/admin/controllers/field.json.php

@@ -7,6 +7,8 @@
  * @license     GNU General Public License version 2 or later, see LICENSE.
  */
 
+use Joomla\Utilities\ArrayHelper;
+
 defined('_JEXEC') or die;
 
 /**
@@ -48,18 +50,18 @@ public function saveOption()
 		$app = JFactory::getApplication();
 
 		$cid = $app->input->get('option-id', array(0), 'array');
-		JArrayHelper::toInteger($cid);
+		ArrayHelper::toInteger($cid);
 
 		$values = $app->input->get('option-value', array(0), 'array');
-		JArrayHelper::toString($values);
+		ArrayHelper::toString($values);
 
 		$labels = $app->input->get('option-label', array(0), 'array');
-		JArrayHelper::toString($labels);
+		ArrayHelper::toString($labels);
 
 		$prices = $app->input->get('option-price', array(0), 'array');
 
 		$sku = $app->input->get('option-sku', array(0), 'array');
-		JArrayHelper::toString($sku);
+		ArrayHelper::toString($sku);
 
 		$fieldId = $app->input->getInt('id', 0);
 

component/admin/controllers/fields.php

@@ -7,6 +7,8 @@
  * @license     GNU General Public License version 2 or later, see LICENSE.
  */
 
+use Joomla\Utilities\ArrayHelper;
+
 defined('_JEXEC') or die;
 
 /**
@@ -41,8 +43,7 @@ public function copy()
 		else
 		{
 			// Make sure the item ids are integers
-			jimport('joomla.utilities.arrayhelper');
-			JArrayHelper::toInteger($cid);
+			ArrayHelper::toInteger($cid);
 
 			// Remove the items.
 			if ($model->copy($cid))

component/admin/controllers/forms.php

@@ -7,6 +7,8 @@
  * @license     GNU General Public License version 2 or later, see LICENSE.
  */
 
+use Joomla\Utilities\ArrayHelper;
+
 defined('_JEXEC') or die;
 
 /**
@@ -41,8 +43,7 @@ public function copy()
 		else
 		{
 			// Make sure the item ids are integers
-			jimport('joomla.utilities.arrayhelper');
-			JArrayHelper::toInteger($cid);
+			ArrayHelper::toInteger($cid);
 
 			// Copy the items.
 			if ($model->copy($cid))

component/admin/controllers/sections.php

@@ -7,6 +7,8 @@
  * @license     GNU General Public License version 2 or later, see LICENSE.
  */
 
+use Joomla\Utilities\ArrayHelper;
+
 defined('_JEXEC') or die;
 
 /**
@@ -41,8 +43,7 @@ public function copy()
 		else
 		{
 			// Make sure the item ids are integers
-			jimport('joomla.utilities.arrayhelper');
-			JArrayHelper::toInteger($cid);
+			ArrayHelper::toInteger($cid);
 
 			// Remove the items.
 			if ($model->copy($cid))

component/admin/controllers/submitters.php

@@ -7,6 +7,8 @@
  * @license     GNU General Public License version 2 or later, see LICENSE.
  */
 
+use Joomla\Utilities\ArrayHelper;
+
 defined('_JEXEC') or die;
 
 /**
@@ -52,7 +54,7 @@ public function confirm()
 			$this->setMessage(JText::plural($this->text_prefix . '_N_SUBMITTERS_CONFIRMED', count($cid)));
 
 			JPluginHelper::importPlugin('redform');
-			$dispatcher = JDispatcher::getInstance();
+			$dispatcher = RFactory::getDispatcher();
 			$dispatcher->trigger('onConfirm', array('admin', &$cid));
 		}
 		else
@@ -85,7 +87,7 @@ public function unconfirm()
 			$this->setMessage(JText::plural($this->text_prefix . '_N_SUBMITTERS_UNCONFIRMED', count($cid)));
 
 			JPluginHelper::importPlugin('redform');
-			$dispatcher = JDispatcher::getInstance();
+			$dispatcher = RFactory::getDispatcher();
 			$dispatcher->trigger('onUnconfirm', array('admin', &$cid));
 		}
 		else
@@ -167,8 +169,7 @@ public function delete()
 		else
 		{
 			// Make sure the item ids are integers
-			jimport('joomla.utilities.arrayhelper');
-			JArrayHelper::toInteger($cid);
+			ArrayHelper::toInteger($cid);
 
 			$force = $this->getTask() == 'forcedelete';
 

component/admin/controllers/values.php

@@ -7,6 +7,8 @@
  * @license     GNU General Public License version 2 or later, see LICENSE.
  */
 
+use Joomla\Utilities\ArrayHelper;
+
 defined('_JEXEC') or die();
 
 /**
@@ -31,8 +33,8 @@ public function saveOrderAjax()
 		$pks = array_slice($pks, 0, -1);
 
 		// Sanitize the input
-		JArrayHelper::toInteger($pks);
-		JArrayHelper::toInteger($order);
+		ArrayHelper::toInteger($pks);
+		ArrayHelper::toInteger($order);
 
 		// Get the model
 		$model = $this->getModel();

component/admin/helpers/acl.php

@@ -30,7 +30,10 @@ public static function getActions($section = 'component', $assetName = 'com_redf
 	{
 		$user = JFactory::getUser();
 		$result	= new JObject;
-		$actions = JAccess::getActions('com_redform', $section);
+		$actions = JAccess::getActionsFromFile(
+			JPATH_ADMINISTRATOR . '/components/com_redform/access.xml',
+			"/access/section[@name='" . $section . "']/"
+		);
 
 		foreach ($actions as $action)
 		{

component/admin/models/form.php

@@ -110,7 +110,7 @@ private function AddFormTable($formid)
 			$q .= ") COMMENT = " . $db->Quote('redFORMS Form ' . $formid);
 			$db->setQuery($q);
 
-			if (!$db->query())
+			if (!$db->execute())
 			{
 				throw new Exception($db->getError());
 			}

component/admin/models/forms/field.xml

@@ -41,7 +41,7 @@
 				label="COM_REDFORM_FORMS_XML_FIELD_TYPE"
 				description="COM_REDFORM_FORMS_XML_FIELD_TYPE_DESC"
 				required="true"
-                onchange="submitform('field.setType');"
+                onchange="Joomla.submitform('field.setType');"
 				/>
 		<field
 				name="tooltip"

component/admin/sql/install.mysql.utf8.sql

@@ -8,13 +8,13 @@ CREATE TABLE IF NOT EXISTS `#__rwf_billinginfo` (
   `company` varchar(150) NOT NULL DEFAULT '',
   `iscompany` tinyint(1) NOT NULL DEFAULT '0',
   `vatnumber` varchar(150) NOT NULL DEFAULT '',
-  `address` text NOT NULL DEFAULT '',
+  `address` text,
   `city` varchar(150) NOT NULL DEFAULT '',
   `zipcode` varchar(150) NOT NULL DEFAULT '',
   `phone` varchar(150) NOT NULL DEFAULT '',
   `email` varchar(150) NOT NULL DEFAULT '',
   `country` varchar(3) NOT NULL DEFAULT '',
-  `params` text NOT NULL DEFAULT '',
+  `params` text,
   PRIMARY KEY (`id`),
   KEY `user_id` (`user_id`),
   KEY `cart_id` (`cart_id`)
@@ -25,12 +25,12 @@ CREATE TABLE IF NOT EXISTS `#__rwf_fields` (
   `field` varchar(255) NOT NULL,
   `field_header` varchar(255) NOT NULL default '',
   `fieldtype` varchar(30) NOT NULL default 'textfield',
-  `checked_out` int(11) NOT NULL default '0',
+  `checked_out` int(11) NULL,
   `checked_out_time` datetime NOT NULL default '0000-00-00 00:00:00',
   `redmember_field` varchar(20) NOT NULL DEFAULT '',
   `default` varchar(255) NOT NULL DEFAULT '',
   `tooltip` varchar(255) NOT NULL DEFAULT '',
-  `params` text NOT NULL DEFAULT '',
+  `params` text,
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Fields for redFORM';
 
@@ -40,41 +40,41 @@ CREATE TABLE IF NOT EXISTS `#__rwf_forms` (
   `startdate` datetime NOT NULL default '0000-00-00 00:00:00',
   `enddate` datetime NOT NULL default '0000-00-00 00:00:00',
   `published` int(1) NOT NULL default '0',
-  `checked_out` int(11) NOT NULL default '0',
+  `checked_out` int(11) NULL,
   `checked_out_time` datetime NOT NULL default '0000-00-00 00:00:00',
   `submissionsubject` varchar(255) NOT NULL default '',
-  `submissionbody` text NOT NULL default '',
+  `submissionbody` text,
   `showname` int(1) NOT NULL default '0',
   `classname` varchar(45) NOT NULL default '',
   `contactpersoninform` tinyint(1) NOT NULL default '0',
   `contactpersonemail` varchar(255) NOT NULL default '',
   `admin_notification_email_mode` tinyint(2) NOT NULL default '0',
   `admin_notification_email_subject` varchar(255) NOT NULL default '',
-  `admin_notification_email_body` text NOT NULL default '',
+  `admin_notification_email_body` text,
   `contactpersonfullpost` int(11) NOT NULL default '0',
   `submitterinform` tinyint(1) NOT NULL default '0',
   `submitnotification` tinyint(1) NOT NULL default '0',
   `enable_confirmation` tinyint(1) NOT NULL DEFAULT '0',
   `enable_confirmation_notification` tinyint(1) NOT NULL DEFAULT '0',
-  `confirmation_notification_recipients` text NOT NULL default '',
+  `confirmation_notification_recipients` text,
   `confirmation_contactperson_subject` varchar(255) NOT NULL default '',
-  `confirmation_contactperson_body` text NOT NULL default '',
+  `confirmation_contactperson_body` text,
   `redirect` VARCHAR( 300 ) NOT NULL default '',
-  `notificationtext` text NOT NULL,
+  `notificationtext` text,
   `formexpires` tinyint(1) NOT NULL default '0',
   `captchaactive` tinyint(1) NOT NULL default '0',
   `access` tinyint(3) NOT NULL default '0',
   `activatepayment` tinyint(2) NOT NULL DEFAULT '0',
   `requirebilling` tinyint(2) NOT NULL DEFAULT '0',
   `currency` varchar(3) NOT NULL default '',
-  `paymentprocessing` text NOT NULL default '',
-  `paymentaccepted` text NOT NULL default '',
-  `contactpaymentnotificationsubject` text NOT NULL default '',
-  `contactpaymentnotificationbody` text NOT NULL default '',
-  `submitterpaymentnotificationsubject` text NOT NULL default '',
-  `submitterpaymentnotificationbody` text NOT NULL default '',
-  `cond_recipients` text NOT NULL default '',
-  `params` text NOT NULL DEFAULT '',
+  `paymentprocessing` text,
+  `paymentaccepted` text,
+  `contactpaymentnotificationsubject` text,
+  `contactpaymentnotificationbody` text,
+  `submitterpaymentnotificationsubject` text,
+  `submitterpaymentnotificationbody` text,
+  `cond_recipients` text,
+  `params` text,
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Forms for redFORM';
 
@@ -106,7 +106,7 @@ CREATE TABLE IF NOT EXISTS `#__rwf_submitters` (
   `integration` VARCHAR(30) NOT NULL default '',
   `answer_id` int(11) NOT NULL default '0',
   `submitternewsletter` int(11) NOT NULL default '0',
-  `rawformdata` text NOT NULL default '',
+  `rawformdata` text,
   `submit_key` varchar(45) NOT NULL,
   `price` DECIMAL(10, 2) NOT NULL default '0.0',
   `vat` DECIMAL(10, 2) NOT NULL default '0.0',
@@ -135,7 +135,7 @@ CREATE TABLE IF NOT EXISTS `#__rwf_values` (
   `value` varchar(255) NOT NULL,
   `label` varchar(255) NOT NULL,
   `published` int(11) NOT NULL default '0',
-  `checked_out` int(11) NOT NULL default '0',
+  `checked_out` int(11) NULL,
   `checked_out_time` datetime NOT NULL default '0000-00-00 00:00:00',
   `field_id` int(11) NOT NULL,
   `ordering` int(11) NOT NULL default '0',
@@ -153,7 +153,7 @@ CREATE TABLE IF NOT EXISTS `#__rwf_payment_request` (
   `vat` DECIMAL(10, 2) NOT NULL default '0.0',
   `currency` varchar(3) NOT NULL default '',
   `paid` tinyint(2) NOT NULL default '0',
-  `note` text NOT NULL default '',
+  `note` text,
   PRIMARY KEY (`id`),
   KEY `submission_id` (`submission_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='payment requests';
@@ -178,7 +178,7 @@ CREATE TABLE IF NOT EXISTS `#__rwf_cart` (
   `vat` DECIMAL(10, 2) NOT NULL default '0.0',
   `currency` varchar(3) NOT NULL default '',
   `paid` tinyint(2) NOT NULL default '0',
-  `note` text NOT NULL default '',
+  `note` text,
   `invoice_id` VARCHAR(100) NOT NULL default '',
   PRIMARY KEY (`id`),
   KEY `reference` (`reference`)
@@ -199,7 +199,7 @@ CREATE TABLE IF NOT EXISTS `#__rwf_payment` (
   `date` datetime NOT NULL default '0000-00-00 00:00:00',
   `gateway` varchar(100) NOT NULL,
   `status` varchar(100) NOT NULL default '',
-  `data` text NOT NULL default '',
+  `data` text,
   `paid` tinyint(2) NOT NULL default '0',
   PRIMARY KEY (`id`),
   KEY `cart_id` (`cart_id`)
@@ -210,8 +210,8 @@ CREATE TABLE IF NOT EXISTS `#__rwf_section` (
   `name` varchar(100) NOT NULL,
   `class` varchar(100) NOT NULL default '',
   `ordering` int(11) NOT NULL default '0',
-  `description` text NOT NULL default '',
-  `checked_out` int(11) NOT NULL default '0',
+  `description` text,
+  `checked_out` int(11) NULL,
   `checked_out_time` datetime NOT NULL default '0000-00-00 00:00:00',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='form sections';

component/admin/sql/updates/mysql/3.0.b.1.0.3.sql

@@ -2,4 +2,4 @@ ALTER TABLE `#__rwf_forms`
 	ADD `enable_confirmation` tinyint(1) NOT NULL DEFAULT '0',
   ADD `enable_confirmation_notification` tinyint(1) NOT NULL DEFAULT '0',
   ADD `confirmation_contactperson_subject` varchar(255) default NULL,
-  ADD `confirmation_contactperson_body` text DEFAULT NULL;
+  ADD `confirmation_contactperson_body` text;

component/admin/sql/updates/mysql/3.0.b.1.0.4.sql

@@ -1,2 +1,2 @@
 ALTER TABLE `#__rwf_forms`
-	ADD `confirmation_notification_recipients` text default NULL;
+	ADD `confirmation_notification_recipients` text;

component/admin/sql/updates/mysql/3.2.0.sql

@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS `#__rwf_billinginfo` (
   `company` varchar(150) NOT NULL,
   `iscompany` tinyint(1) NOT NULL DEFAULT '0',
   `vatnumber` varchar(150) NOT NULL,
-  `address` text NOT NULL,
+  `address` text NULL,
   `city` varchar(150) NOT NULL,
   `zipcode` varchar(150) NOT NULL,
   `phone` varchar(150) NOT NULL,
@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS `#__rwf_payment_request` (
   `vat` DECIMAL(10, 2) NULL DEFAULT NULL,
   `currency` varchar(3) DEFAULT NULL,
   `paid` tinyint(2) NOT NULL,
-  `note` text NULL,
+  `note` text,
   PRIMARY KEY (`id`),
   KEY `submission_id` (`submission_id`)
 ) COMMENT='payment requests';
@@ -75,7 +75,7 @@ CREATE TABLE IF NOT EXISTS `#__rwf_cart` (
   `vat` DECIMAL(10, 2) NULL DEFAULT NULL,
   `currency` varchar(3) DEFAULT NULL,
   `paid` tinyint(2) NOT NULL,
-  `note` text NULL,
+  `note` text,
   PRIMARY KEY (`id`),
   KEY `reference` (`reference`)
 ) COMMENT='payment cart';
@@ -97,7 +97,7 @@ CREATE TABLE IF NOT EXISTS `#__rwf_payment_request` (
   `vat` double NULL DEFAULT NULL,
   `currency` varchar(3) DEFAULT NULL,
   `paid` tinyint(2) NOT NULL,
-  `note` text NULL,
+  `note` text,
   PRIMARY KEY (`id`),
   KEY `submission_id` (`submission_id`)
 ) COMMENT='submissions payment requests';