v7.5.0

Author: larangin

application/config/constants.php

@@ -1,7 +1,7 @@
 <?php  if ( ! defined( 'BASEPATH' ) ) {
 	exit( 'No direct script access allowed' );}
 
-define( 'UIFORM_VERSION', '7.4.9' );
+define( 'UIFORM_VERSION', '7.5.0' );
 define( 'ZIGAFORM_F_LITE', 1 );
 define( 'UIFORM_DEBUG', 0 );
 define( 'UIFORM_DEMO', 0 );

application/helpers/hooking_helper.php

@@ -41,9 +41,9 @@ function remove_filter( $name, $callback ) {
 	}
 }
 
-if ( ! function_exists( 'do_filter' ) ) {
-	function do_filter( $name, $value , ...$args) {
-		return get_hooking_instance()->do_filter( $name, $value, $args );
+if ( ! function_exists( 'apply_filters' ) ) {
+	function apply_filters( $name, $value , ...$args) {
+		return get_hooking_instance()->apply_filters( $name, $value, $args );
 	}
 }
 

application/libraries/Hooking.php

@@ -135,17 +135,17 @@ public function remove_filter( $name, $callback ) {
 	}
 
 	/**
-	 * Hooking::do_filter()
+	 * Hooking::apply_filters()
 	 *
 	 * Calls the actual filter (usually placed in a view)
 	 * e.g.
-	 * <h1><?php echo do_filter('welcome_title', 'Welcome to Codeigniter'); ?></h1>
+	 * <h1><?php echo apply_filters('welcome_title', 'Welcome to Codeigniter'); ?></h1>
 	 *
 	 * @param string $name The name of the action to execute
 	 * @param array  $args The list of parameters to pass on to the action (optional)
 	 * @return string
 	 */
-	public function do_filter( $name, $value, $args = array() ) {
+	public function apply_filters( $name, $value, $args = array() ) {
 		$result = $value;
 		if ( isset( $this->_filters[ $name ] ) && is_array( $this->_filters[ $name ] ) ) {
 			foreach ( $this->_filters[ $name ] as $filter ) {

application/modules/formbuilder/controllers/fields.php

@@ -70,7 +70,7 @@ public function ajax_dev_genfieldopts()
     {
 
         $data_render = array();
-        $this->back_cache_tab_more = do_filter('zgfm_back_field_opt_more', array());
+        $this->back_cache_tab_more = apply_filters('zgfm_back_field_opt_more', array());
         $array = array( 1, 2, 3, 4, 5, 6, 8, 9, 10, 11 );
         foreach ( $array as $type) {
             switch ( intval($type)) {
@@ -291,7 +291,7 @@ public function load_field_options($type, $id, $block = null)
                 if (intval(get_option('zgfm_fields_fastload', 0)) === 0) {
                     $data['modules_field_more'] = $this->back_cache_tab_more;
                 } else {
-                    $data['modules_field_more'] = do_filter('zgfm_back_field_opt_more', '');
+                    $data['modules_field_more'] = apply_filters('zgfm_back_field_opt_more', '');
                 }
                 $data['obj_sfm']            = Uiform_Form_Helper::get_font_library();
                     $output                .= $this->load->view('formbuilder/fields/modal/field_opt_text', $data, true);

application/modules/formbuilder/controllers/forms.php

@@ -1353,7 +1353,7 @@ public function generate_form_html_multistep($form_id = null)
         $str_output_2 .= $this->generate_form_css($form_id);
 
         //generate css hook
-        $str_output_2 .= do_filter('zgfm_front_ms_aditional_css', $form_id);
+        $str_output_2 .= apply_filters('zgfm_front_ms_aditional_css', $form_id);
 
         $return                = array();
         $return['output_html'] = $this->generate_form_container_multistep($form_id);
@@ -1373,8 +1373,8 @@ public function generate_form_container_multistep($id)
         $data['onsubm']       = $this->current_data_onsubm;
         $data['main']         = $this->current_data_main;
         $data['connections'] = $this->current_data_conn;
-        $data['outertop'] = do_filter('zgfm_front_ms_form_outertop', '');
-        $data['innertop'] = do_filter('zgfm_front_ms_form_innertop', '');
+        $data['outertop'] = apply_filters('zgfm_front_ms_form_outertop', '');
+        $data['innertop'] = apply_filters('zgfm_front_ms_form_innertop', '');
         return $this->load->view('formbuilder/forms/formhtml_form_parent', $data, true);
     }
 
@@ -1609,7 +1609,7 @@ public function ajax_save_childform()
 
 
             // addon data
-            $fmb_addon_data =  do_filter('zgfm_back_addon_obtain_data', [], $data_form->fmb_parent);
+            $fmb_addon_data =  apply_filters('zgfm_back_addon_obtain_data', [], $data_form->fmb_parent);
 
             // all data fields
             $fmb_data['addons'] = $fmb_addon_data;
@@ -1626,7 +1626,7 @@ public function ajax_save_childform()
             );
 
             // process addons
-            $fmb_data = do_filter('zgfm_back_animtocore', $fmb_data, $json['id']);
+            $fmb_data = apply_filters('zgfm_back_animtocore', $fmb_data, $json['id']);
 
             // all data fields
             //$this->current_data_addon    = $fmb_data['addons'];
@@ -1787,7 +1787,7 @@ public function ajax_save_form()
             );
 
             // process addons
-            $fmb_data = do_filter('zgfm_saveForm_store', $fmb_data, $json['id']);
+            $fmb_data = apply_filters('zgfm_saveForm_store', $fmb_data, $json['id']);
 
             // all data fields
             $this->current_data_addon    = $fmb_data['addons'];
@@ -1942,7 +1942,7 @@ protected function generate_form_getField($child_field)
         $data['addon_extraclass'] = '';
 
         // process addons
-        $data = do_filter('zgfm_field_addon_extraclass', $data);
+        $data = apply_filters('zgfm_field_addon_extraclass', $data);
         // process addons
         /*if (!empty(self::$_addons_actions)) {
             foreach (self::$_addons_actions as $zkey => $zvalue) {

application/modules/formbuilder/controllers/frontend.php

@@ -200,7 +200,7 @@ public function generate_cache($form_id)
             $form_variables['_uifmvar']['is_dev']  = 0;
             $form_variables['onload_scroll']       = $onload_scroll;
             $form_variables['preload_noconflict']  = $preload_noconflict;
-            $enqueue_scripts                       = do_filter('zgfm_front_enqueue_scripts', array());
+            $enqueue_scripts                       = apply_filters('zgfm_front_enqueue_scripts', array());
 
             $data_scripts = array();
             $data_styles  = array();
@@ -312,7 +312,7 @@ public function getform()
             $form_variables['_uifmvar']['is_dev']  = 0;
             $form_variables['onload_scroll']       = $onload_scroll;
             $form_variables['preload_noconflict']  = $preload_noconflict;
-            $form_variables['enqueue_scripts']     = do_filter('zgfm_front_enqueue_scripts', array());
+            $form_variables['enqueue_scripts']     = apply_filters('zgfm_front_enqueue_scripts', array());
             $form_variables['ajaxurl']             = '';
             $form_variables['uifm_baseurl']        = base_url();
             $form_variables['uifm_siteurl']        = site_url();

application/modules/formbuilder/views/fields/render_front/type_appprep.php

@@ -15,7 +15,7 @@
     exit('No direct script access allowed');
 }
 ob_start();
-$nameField =  do_filter('uifm_ms_render_field_front', "uiform_fields[".$id."]", $id, $type);
+$nameField =  apply_filters('uifm_ms_render_field_front', "uiform_fields[".$id."]", $id, $type);
 ?>
  <div class="sfdc-input-group">
         <div class="sfdc-input-group-addon rockfm-inp-preptxt"><?php echo urldecode($input['prepe_txt']); ?></div>

application/modules/formbuilder/views/fields/render_front/type_apptext.php

@@ -15,7 +15,7 @@
     exit('No direct script access allowed');
 }
 ob_start();
-$nameField =  do_filter('uifm_ms_render_field_front', "uiform_fields[".$id."]", $id, $type);
+$nameField =  apply_filters('uifm_ms_render_field_front', "uiform_fields[".$id."]", $id, $type);
 ?>
  <div class="sfdc-input-group">
         <input placeholder="<?php echo htmlentities($input['placeholder'], ENT_QUOTES, 'UTF-8'); ?>"

application/modules/formbuilder/views/fields/render_front/type_checkbox.php

@@ -36,7 +36,7 @@ class="rockfm-input2-wrap">
 usort($input2['options'], ['Uiform_Form_Helper', 'compareByOrder']);
 foreach ( $input2['options'] as $key => $value) {
     $checked = '';
-    $nameField =  do_filter('uifm_ms_render_field_front', "uiform_fields[".$id."][".$value['id']."]", $id, $type, $value['id']);
+    $nameField =  apply_filters('uifm_ms_render_field_front', "uiform_fields[".$id."][".$value['id']."]", $id, $type, $value['id']);
     if ( isset($value['checked']) && intval($value['checked']) === 1) {
         $checked = 'checked="checked"';
     }

application/modules/formbuilder/views/fields/render_front/type_colorpicker.php

@@ -15,7 +15,7 @@
     exit('No direct script access allowed');
 }
 ob_start();
-$nameField =  do_filter('uifm_ms_render_field_front', "uiform_fields[".$id."]", $id, $type);
+$nameField =  apply_filters('uifm_ms_render_field_front', "uiform_fields[".$id."]", $id, $type);
 ?>
  <div class="sfdc-input-group rockfm-colorpicker-wrap"
       data-uifm-tabnum="<?php echo $tab_num; ?>"