Skip to content

Commit

Permalink
v7.2.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@larangin
larangin committed Oct 29, 2024
1 parent 016cbe9 commit a2c6e84
Show file tree
Hide file tree
Showing 52 changed files with 4,592 additions and 3,541 deletions.
2 changes: 1 addition & 1 deletion application/config/constants.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php if ( ! defined( 'BASEPATH' ) ) {
exit( 'No direct script access allowed' );}

define( 'UIFORM_VERSION', '7.2.5' );
define( 'UIFORM_VERSION', '7.2.9' );
define( 'ZIGAFORM_F_LITE', 1 );
define( 'UIFORM_DEBUG', 0 );
define( 'UIFORM_DEMO', 0 );
Expand Down
8 changes: 8 additions & 0 deletions application/helpers/common_helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
class Uiform_Form_Helper
{

public static function urlIsValid( $url ){
$headers = @get_headers($url);
if($headers){
return true;
}
return false;
}

public static function createCustomFolder()
{
$folderPath = FCPATH . '/uploads/form-styles';
Expand Down
2 changes: 1 addition & 1 deletion application/modules/addon_mgtranslate/assets/backend/js/admin.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion application/modules/formbuilder/controllers/forms.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3880,7 +3880,7 @@ public function create_uiform()
$data['pdf_paper_size'] = $pdf_paper_size;

$data['fields_fastload'] = get_option('zgfm_fields_fastload', 0);

$data['obj_sfm'] = Uiform_Form_Helper::get_font_library();
// $data['modules_tab_extension']= self::$_modules['addon']['backend']->addons_doActions('back_exttab_block');

$data['modules_tab_extension'] = modules::run('addon/zfad_backend/addons_doActions', 'back_exttab_block', true);
Expand Down
4 changes: 3 additions & 1 deletion application/modules/formbuilder/controllers/frontend.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -808,9 +808,11 @@ public function ajax_mm_get_child()
*/
public function ajax_refresh_captcha()
{

$rkver = ( isset($_POST['rkver']) ) ? Uiform_Form_Helper::sanitizeInput(trim($_POST['rkver'])) : 0;
if ( $rkver) {
$rkver = Uiform_Form_Helper::base64url_decode(json_decode($rkver));

$rkver = Uiform_Form_Helper::base64url_decode($rkver);
$rkver_arr = json_decode($rkver, true);

$length = 5;
Expand Down
6 changes: 4 additions & 2 deletions application/modules/formbuilder/controllers/settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ private function manifestIsOk(){
$cur = dirname(APPPATH).'/';
$manifestPath = $cur.'assets/backend/json/manifest.json';

if(!file_exists($manifestPath)){
if(!file_exists($manifestPath) || empty(file_get_contents($manifestPath))){
return [
'status'=> $status,
'failed'=>[]
Expand All @@ -426,7 +426,9 @@ private function manifestIsOk(){
])){
continue;
}

if (strpos($file, "install/") === 0) {
continue;
}
if (strpos($file, "i18n/languages/") === 0) {
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions application/modules/formbuilder/models/model_settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ protected function loadSettings()
self::$db_config['smtp_conn'] = $row->smtp_conn;
self::$db_config['sendmail_path'] = $row->sendmail_path;
self::$db_config['language'] = $row->language;
self::$db_config['version'] = $row->version;
self::$db_config['version'] = UIFORM_VERSION;

$this->cache->write(self::$db_config, 'settings');
}
Expand All @@ -141,7 +141,7 @@ protected function loadSettings()
self::$db_config['smtp_conn'] = $data['smtp_conn'];
self::$db_config['sendmail_path'] = $data['sendmail_path'];
self::$db_config['language'] = $data['language'];
self::$db_config['version'] = ( isset($data['version']) ) ? $data['version'] : 0;
self::$db_config['version'] = UIFORM_VERSION;
}
}

Expand Down
110 changes: 108 additions & 2 deletions application/modules/formbuilder/views/fields/modal/settings_field_input_6.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,115 @@
exit('No direct script access allowed');
}
?>

<div class="uifm-set-section-input6">

<div class="sfdc-row">
<div class="sfdc-col-md-12">
<div class="divider2">
<div class="mask"></div>
<span><i><?php echo __('Indicator text', 'FRocket_admin'); ?></i></span>
</div>
</div>
</div>
<div class="sfdc-row">
<div class="sfdc-col-sm-12">
<div class="sfdc-form-group">
<label for="uifm_fld_lbl_txt"><?php echo __('Text', 'FRocket_admin'); ?></label>
<div class="sfdc-input-group">
<div class="uifm-set-section-input6-txtvalue">
<input type="text"
data-field-store="input6-indtext_txt"
id="uifm_fld_input6_indtext_txt"
name="uifm_fld_input6_indtext_txt"
class="sfdc-form-control uifm-f-setoption">
</div>
<div class="sfdc-input-group-btn">
<select data-field-store="input6-indtext_size"
id="uifm_fld_inp6_indtext_size"
data-live-search="true"
data-style="sfdc-btn-primary"
data-width="80px"
class="uifm_field_font_selectpicker uifm-f-setoption-font">
<optgroup label="Font size" data-max-options="2">
<?php
for ( $i = 8; $i <= 48; $i++) {
?>
<option value="<?php echo $i; ?>"><?php echo $i . ' px'; ?></option>
<?php
}
?>
</optgroup>
</select>
</div>
<div class="sfdc-input-group-btn">
<button data-field-store="input6-indtext_bold"
class="sfdc-btn sfdc-btn-warning uifm-f-setoption-btn"
type="button">
<i class="fa fa-bold"></i>
<input type="hidden" id="uifm_fld_inp6_indtext_bold" value="0">
</button>
<button data-field-store="input6-indtext_italic"
class="sfdc-btn sfdc-btn-warning uifm-f-setoption-btn"
type="button"><i class="fa fa-italic"></i>
<input type="hidden" id="uifm_fld_inp6_indtext_italic" value="0">
</button>
<button data-field-store="input6-indtext_underline"
class="sfdc-btn sfdc-btn-warning uifm-f-setoption-btn"
type="button"><i class="fa fa-underline"></i>
<input type="hidden" id="uifm_fld_inp6_indtext_underline" value="0">
</button>
</div>
</div>
</div>
</div>
</div>
<div class="sfdc-row">
<div class="sfdc-col-md-12">
<div class="sfdc-form-group">
<label ><?php echo __('Color', 'FRocket_admin'); ?></label>
<div class="">
<div class="sfdc-col-md-3">
<input class="switch-field"
data-field-store="input6-indtext_color_st"
id="uifm_fld_inp6_indtext_color_st"
type="checkbox"/>
</div>
<div class="sfdc-col-md-9">

<div class="sfdc-row">
<div class="sfdc-col-md-3">
<label ><?php echo __('Color', 'FRocket_admin'); ?></label>
</div>
<div class="sfdc-col-sm-9">
<div class="sfdc-form-group">
<div data-field-store="input6-indtext_color"
class="sfdc-input-group uifm-custom-color">
<span class="sfdc-input-group-addon"><i></i></span>
<input placeholder="<?php echo __('Pick the color', 'FRocket_admin'); ?>"
id="uifm_fld_inp6_indtext_color"
type="text"

class="sfdc-form-control" />
</div>
</div>
</div>
</div>

</div>
</div>
</div>

</div>
</div>

<div class="space10"></div>
<div class="sfdc-row">
<div class="sfdc-col-md-12">
<div class="divider2">
<div class="mask"></div>
<span><i><?php echo __('Captcha Image', 'FRocket_admin'); ?></i></span>
</div>
</div>
</div>
<div class="space10"></div>
<div class="sfdc-row">
<div class="sfdc-col-md-12">
Expand Down
Loading

0 comments on commit a2c6e84

Please sign in to comment.