Skip to content

Commit 6822269

Browse files
laranginlarangin
committed
v7.3.9
1 parent 3d2e8cd commit 6822269

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1652
-1416
lines changed

‎application/config/constants.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php if ( ! defined( 'BASEPATH' ) ) {
22
exit( 'No direct script access allowed' );}
33

4-
define( 'UIFORM_VERSION', '7.3.1' );
4+
define( 'UIFORM_VERSION', '7.3.9' );
55
define( 'ZIGAFORM_F_LITE', 1 );
66
define( 'UIFORM_DEBUG', 0 );
77
define( 'UIFORM_DEMO', 0 );

‎application/helpers/dompdflib_helper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function generate_pdf_old( $html, $filename, $stream = true ) {
3131
function generate_pdf( $html, $filename, $papersize, $paperorien, $stream = true ) {
3232

3333
if ( version_compare(phpversion(), '8.0', '>=') ) {
34-
require_once 'dompdf/2.0.3/vendor/autoload.php';
34+
require_once 'dompdf/3.0.0/vendor/autoload.php';
3535
} elseif (version_compare(phpversion(), '7.1', '>='))
3636
{
3737
require_once 'dompdf/0.8.5/autoload.inc.php';

‎application/modules/addon/models/model_addon.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public function getListAddons($per_page = '', $segment = '')
237237
$this->table
238238
);
239239

240-
if ( $per_page != '' || $segment != '') {
240+
if ( (int) $per_page > 0) {
241241
$segment = ( ! empty($segment) ) ? $segment : 0;
242242
$query .= sprintf(' limit %s,%s', (int) $segment, (int) $per_page);
243243
}

‎application/modules/formbuilder/controllers/forms.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ public function ajax_load_preview_form()
10721072
$temp['base_url'] = base_url();
10731073
$temp['form_id'] = $form_id;
10741074

1075-
$data['iframe'] = $this->load->view('formbuilder/forms/get_code_iframe', $temp, true);
1075+
$data['iframe'] = $this->load->view('formbuilder/forms/get_preview', $temp, true);
10761076
ob_start();
10771077
echo $data['iframe'];
10781078
?>

‎application/modules/formbuilder/controllers/frontend.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ class Frontend extends FrontendController
3838
private $form_rec_msg_summ = '';
3939
private $form_email_err = array();
4040
private $current_form_id = '';
41-
41+
private $form_cur;
42+
private $form_cur_data2 = array();
43+
4244
const PREFIX = 'wprofmr_';
4345

4446
/**
@@ -1506,9 +1508,9 @@ public function pdf_show_record()
15061508
<h1><?php echo $form_data->fmb_name; ?></h1>
15071509
<h4><?php echo __('Order summary', 'FRocket_admin'); ?></h4>
15081510

1509-
<?php
1510-
echo modules::run('formbuilder/frontend/get_summaryRecord', $rec_id);
1511-
?>
1511+
<?php
1512+
echo $this->get_summaryRecord($rec_id);
1513+
?>
15121514

15131515
<?php
15141516
$content = ob_get_contents();

‎application/modules/formbuilder/models/model_form_log.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getListForms($per_page = '', $segment = '')
6666
$this->table
6767
);
6868

69-
if ( $per_page != '' || $segment != '') {
69+
if ( (int) $per_page > 0) {
7070
$segment = ( ! empty($segment) ) ? $segment : 0;
7171
$query .= sprintf(' limit %s,%s', $segment, $per_page);
7272
}

‎application/modules/formbuilder/models/model_forms.php‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function getListFormsFiltered($data)
8080

8181
$query .= sprintf(' ORDER BY uf.updated_date %s ', $orderby);
8282

83-
if ( $per_page != '' || $segment != '') {
83+
if ( (int) $per_page > 0) {
8484
$segment = ( ! empty($segment) ) ? $segment : 0;
8585
$query .= sprintf(' limit %s,%s', (int) $segment, (int) $per_page);
8686
}
@@ -118,7 +118,7 @@ public function getListTrashFormsFiltered($data)
118118

119119
$query .= sprintf(' ORDER BY uf.updated_date %s ', $orderby);
120120

121-
if ( $per_page != '' || $segment != '') {
121+
if ( (int) $per_page > 0) {
122122
$segment = ( ! empty($segment) ) ? $segment : 0;
123123
$query .= sprintf(' limit %s,%s', (int) $segment, (int) $per_page);
124124
}
@@ -149,7 +149,7 @@ public function getListForms($per_page = '', $segment = '')
149149
$this->table
150150
);
151151

152-
if ( $per_page != '' || $segment != '') {
152+
if ( (int) $per_page > 0) {
153153
$segment = ( ! empty($segment) ) ? $segment : 0;
154154
$query .= sprintf(' limit %s,%s', (int) $segment, (int) $per_page);
155155
}
@@ -259,11 +259,28 @@ public function getFieldsById($id)
259259
return $query2->result();
260260
}
261261

262+
public function getFieldNamesById($id_form)
263+
{
264+
$query = sprintf(
265+
'select f.fmf_uniqueid,f.fmf_id, fm.fmb_type, coalesce(NULLIF(f.fmf_fieldname,""),CONCAT(t.fby_name,f.fmf_id)) as fieldname
266+
from %s f
267+
join %s t on f.type_fby_id=t.fby_id
268+
join %s fm on fm.fmb_id=f.form_fmb_id
269+
where fm.fmb_id=%s and t.fby_id in (8,9,10,11,16,18,39,40,41,42)',
270+
$this->tbformfields,
271+
$this->tbformtype,
272+
$this->table,
273+
(int) $id_form
274+
);
275+
$query2 = $this->db->query($query);
276+
return $query2->result();
277+
}
278+
262279
public function getFormById_2($id)
263280
{
264281
$query = sprintf(
265282
'
266-
select uf.fmb_data2,uf.fmb_name, uf.fmb_type
283+
select uf.fmb_data2,uf.fmb_name, uf.fmb_type, uf.fmb_rec_tpl_st
267284
from %s uf
268285
where uf.fmb_id=%s
269286
',

‎application/modules/formbuilder/models/model_record.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getListRecords($per_page = '', $segment = '')
6666
$this->tbform
6767
);
6868

69-
if ( $per_page != '' || $segment != '') {
69+
if ( (int) $per_page > 0) {
7070
$segment = ( ! empty($segment) ) ? $segment : 0;
7171
$query .= sprintf(' limit %s,%s', (int) $segment, (int) $per_page);
7272
}
@@ -144,7 +144,7 @@ public function getListTrashRecordsFiltered($data)
144144

145145
$query .= sprintf(' ORDER BY c.created_date %s ', $orderby);
146146

147-
if ( $per_page != '' || $segment != '') {
147+
if ( (int) $per_page > 0) {
148148
$segment = ( ! empty($segment) ) ? $segment : 0;
149149
$query .= sprintf(' limit %s,%s', (int) $segment, (int) $per_page);
150150
}

‎application/modules/formbuilder/views/fields/modal/settings_field_helpblock.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ class="uifm_tinymce_obj"
5353
<input
5454
type="text"
5555
value=""
56-
id="uifm_fld_lbl_color"
57-
name="uifm_fld_lbl_color" class="sfdc-form-control" />
56+
id="uifm_fld_hblock_color"
57+
name="uifm_fld_hblock_color" class="sfdc-form-control" />
5858
<span class="sfdc-input-group-addon"><i></i></span>
5959
</div>
6060

‎application/modules/formbuilder/views/fields/render_back/fieldoptions_data_10.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5164,8 +5164,8 @@ class=&quot;uifm_tinymce_obj&quot;
51645164
&lt;input
51655165
type=&quot;text&quot;
51665166
value=&quot;&quot;
5167-
id=&quot;uifm_fld_lbl_color&quot;
5168-
name=&quot;uifm_fld_lbl_color&quot; class=&quot;sfdc-form-control&quot; /&gt;
5167+
id=&quot;uifm_fld_hblock_color&quot;
5168+
name=&quot;uifm_fld_hblock_color&quot; class=&quot;sfdc-form-control&quot; /&gt;
51695169
&lt;span class=&quot;sfdc-input-group-addon&quot;&gt;&lt;i&gt;&lt;/i&gt;&lt;/span&gt;
51705170
&lt;/div&gt;
51715171

0 commit comments

Comments
 (0)