#36 - Contact module improvements.

modules/boonex/contact/classes/BxContactConfig.php

@@ -10,14 +10,12 @@
  */
 
 bx_import('BxDolPrivacy');
-bx_import('BxDolModuleConfig');
+bx_import('BxBaseModGeneralConfig');
 
-class BxContactConfig extends BxDolModuleConfig
+class BxContactConfig extends BxBaseModGeneralConfig
 {
     protected $_oDb;
 
-    protected $_sAlertSystemName;
-
     protected $_sEmail;
 
     /**
@@ -27,7 +25,11 @@ class BxContactConfig extends BxDolModuleConfig
     {
         parent::__construct($aModule);
 
-        $this->_sAlertSystemName = $this->_sName;
+        $this->_aObjects = array(
+        	'alert' => $this->_sName,
+        	'form_contact' => $this->_sName . '_contact',
+        	'form_display_contact_send' => $this->_sName . '_contact_send'
+        );
 
         $this->_sEmail = '';
     }
@@ -41,19 +43,6 @@ class BxContactConfig extends BxDolModuleConfig
             $this->_sEmail = getParam('site_email');
     }
 
-    public function getSystemName($sType)
-    {
-        $sResult = '';
-
-        switch($sType) {
-            case 'alert':
-                $sResult = $this->_sAlertSystemName;
-                break;
-        }
-
-        return $sResult;
-    }
-
     public function getEmail()
     {
         return $this->_sEmail;

modules/boonex/contact/classes/BxContactModule.php

@@ -39,7 +39,7 @@ class BxContactModule extends BxDolModule
         $sResult = '';
 
         bx_import('BxDolForm');
-        $oForm = BxDolForm::getObjectInstance('mod_cnt_contact', 'mod_cnt_contact_send');
+        $oForm = BxDolForm::getObjectInstance($this->_oConfig->getObject('form_contact'), $this->_oConfig->getObject('form_display_contact_send'), $this->_oTemplate);
 
         $oForm->initChecker();
         if($oForm->isSubmittedAndValid()) {
@@ -114,7 +114,7 @@ class BxContactModule extends BxDolModule
 
         //--- Event -> Contact for Alerts Engine ---//
         bx_import('BxDolAlerts');
-        $oAlert = new BxDolAlerts($this->_oConfig->getSystemName('alert'), 'contact', 0, $iUserId);
+        $oAlert = new BxDolAlerts($this->_oConfig->getObject('alert'), 'contact', 0, $iUserId);
         $oAlert->alert();
         //--- Event -> Contact for Alerts Engine ---//
     }

modules/boonex/contact/install/sql/install.sql

@@ -16,24 +16,24 @@ CREATE TABLE IF NOT EXISTS `bx_contact_entries` (
 
 -- FORMS
 INSERT INTO `sys_objects_form` (`object`, `module`, `title`, `action`, `form_attrs`, `submit_name`, `table`, `key`, `uri`, `uri_title`, `params`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES
-('mod_cnt_contact', @sName, '_bx_contact_form_contact', '', '', 'do_submit', 'bx_contact_entries', 'id', 'uri', 'subject', '', 0, 1, '', '');
+('bx_contact_contact', @sName, '_bx_contact_form_contact', '', '', 'do_submit', 'bx_contact_entries', 'id', 'uri', 'subject', '', 0, 1, '', '');
 
 INSERT INTO `sys_form_displays` (`display_name`, `module`, `object`, `title`, `view_mode`) VALUES
-('mod_cnt_contact_send', @sName, 'mod_cnt_contact', '_bx_contact_form_contact_display_send', 0);
+('bx_contact_contact_send', @sName, 'bx_contact_contact', '_bx_contact_form_contact_display_send', 0);
 
 INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES
-('mod_cnt_contact', @sName, 'name', '', '', 0, 'text', '_bx_contact_form_contact_input_sys_name', '_bx_contact_form_contact_input_name', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:1;s:3:"max";i:150;}', '_bx_contact_form_contact_input_name_err', 'Xss', '', 0, 0),
-('mod_cnt_contact', @sName, 'email', '', '', 0, 'text', '_bx_contact_form_contact_input_sys_email', '_bx_contact_form_contact_input_email', '', 1, 0, 0, '', '', '', 'Email', '', '_bx_contact_form_contact_input_email_err', 'Xss', '', 0, 0),
-('mod_cnt_contact', @sName, 'subject', '', '', 0, 'text', '_bx_contact_form_contact_input_sys_subject', '_bx_contact_form_contact_input_subject', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:5;s:3:"max";i:250;}', '_bx_contact_form_contact_input_subject_err', 'Xss', '', 0, 0),
-('mod_cnt_contact', @sName, 'body', '', '', 0, 'textarea', '_bx_contact_form_contact_input_sys_body', '_bx_contact_form_contact_input_body', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:10;s:3:"max";i:5000;}', '_bx_contact_form_contact_input_body_err', 'Xss', '', 0, 0),
-('mod_cnt_contact', @sName, 'do_submit', '_bx_contact_form_contact_input_do_submit', '', 0, 'submit', '_bx_contact_form_contact_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0);
+('bx_contact_contact', @sName, 'name', '', '', 0, 'text', '_bx_contact_form_contact_input_sys_name', '_bx_contact_form_contact_input_name', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:1;s:3:"max";i:150;}', '_bx_contact_form_contact_input_name_err', 'Xss', '', 0, 0),
+('bx_contact_contact', @sName, 'email', '', '', 0, 'text', '_bx_contact_form_contact_input_sys_email', '_bx_contact_form_contact_input_email', '', 1, 0, 0, '', '', '', 'Email', '', '_bx_contact_form_contact_input_email_err', 'Xss', '', 0, 0),
+('bx_contact_contact', @sName, 'subject', '', '', 0, 'text', '_bx_contact_form_contact_input_sys_subject', '_bx_contact_form_contact_input_subject', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:5;s:3:"max";i:250;}', '_bx_contact_form_contact_input_subject_err', 'Xss', '', 0, 0),
+('bx_contact_contact', @sName, 'body', '', '', 0, 'textarea', '_bx_contact_form_contact_input_sys_body', '_bx_contact_form_contact_input_body', '', 1, 0, 0, '', '', '', 'Length', 'a:2:{s:3:"min";i:10;s:3:"max";i:5000;}', '_bx_contact_form_contact_input_body_err', 'Xss', '', 0, 0),
+('bx_contact_contact', @sName, 'do_submit', '_bx_contact_form_contact_input_do_submit', '', 0, 'submit', '_bx_contact_form_contact_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0);
 
 INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_for_levels`, `active`, `order`) VALUES
-('mod_cnt_contact_send', 'name', 2147483647, 1, 1),
-('mod_cnt_contact_send', 'email', 2147483647, 1, 2),
-('mod_cnt_contact_send', 'subject', 2147483647, 1, 3),
-('mod_cnt_contact_send', 'body', 2147483647, 1, 4),
-('mod_cnt_contact_send', 'do_submit', 2147483647, 1, 5);
+('bx_contact_contact_send', 'name', 2147483647, 1, 1),
+('bx_contact_contact_send', 'email', 2147483647, 1, 2),
+('bx_contact_contact_send', 'subject', 2147483647, 1, 3),
+('bx_contact_contact_send', 'body', 2147483647, 1, 4),
+('bx_contact_contact_send', 'do_submit', 2147483647, 1, 5);
 
 
 -- STUDIO PAGE & WIDGET