Changeset 2556411
- Timestamp:
- 06/30/2021 01:13:56 PM (5 years ago)
- Location:
- easy-form-builder/trunk
- Files:
-
- 8 edited
-
emsfb.php (modified) (1 diff)
-
includes/admin/assets/js/admin.js (modified) (17 diffs)
-
includes/admin/assets/js/core.js (modified) (1 diff)
-
includes/admin/assets/js/list_form.js (modified) (4 diffs)
-
includes/admin/class-Emsfb-create.php (modified) (2 diffs)
-
includes/class-Emsfb-public.php (modified) (1 diff)
-
public/assets/js/core.js (modified) (4 diffs)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
easy-form-builder/trunk/emsfb.php
r2554444 r2556411 4 4 * Plugin URI: https://whitestudio.team 5 5 * Description: Easily create multi-step forms with tracking code support by using Easy Form Builder's drag & drop form wizard. This is the free version with limits. 6 * Version: 1.33. 66 * Version: 1.33.7 7 7 * Author: WhiteStudio 8 8 * Author URI: https://whitestudio.team -
easy-form-builder/trunk/includes/admin/assets/js/admin.js
r2554444 r2556411 15 15 16 16 let formName_ws = `EasyFormBuilder-${Math.random().toString(36).substr(2, 3)}`; 17 let trackingCode_efb='false'; 17 18 let form_ID_emsFormBuilder =0; 18 19 let highestAmount_emsFormBuilder; … … 227 228 if (val.formName) { 228 229 val.formName = formName_ws; 230 val.trackingCode = trackingCode_efb; 229 231 saveLocalStorage_emsFormBuilder() 230 232 //formName … … 233 235 234 236 })// end event change formName_ws 237 238 if(document.getElementById("trackingcode_emsFormBuilder")){ 239 document.getElementById("trackingcode_emsFormBuilder").addEventListener("click", (e) => { 240 let checked = document.getElementById("trackingcode_emsFormBuilder").checked; 241 // console.log(`checked [${checked}]`); 242 // console.log(valueJson_ws_p); 243 trackingCode_efb = `${checked}`; 244 for (const val of valueJson_ws_p) { 245 if (val.trackingCode) { 246 val.trackingCode = trackingCode_efb; 247 saveLocalStorage_emsFormBuilder() 248 //formName 249 }else if(val.EfbVersion==1.2){ 250 val.EfbVersion =1.3; 251 Object.assign(val, {trackingCode:trackingCode_efb}) 252 // console.log(valueJson_ws_p); 253 } 254 } 255 })// end event trackingcode_emsFormBuilder 256 } 257 235 258 236 259 } … … 313 336 } 314 337 315 const statusOfDelete = rndm!="emailRegisterEFB" && rndm!="emailRegisterEFB" && rndm!="passwordRegisterEFB" && rndm!=="usernameRegisterEFB"? true : false ; 338 const statusOfDelete = rndm!="emaillogin" && rndm!="passwordlogin" && rndm!="emailRegisterEFB" && rndm!="passwordRegisterEFB" && rndm!="usernameRegisterEFB"? true : false ; 339 316 340 const newElement = ` 317 341 <div id="${rndm}" class="section border border-primary rounded mb-0 h-30 view overlay ml-3 mr-3 mt-2 mb-1" draggable="true"> … … 568 592 let id_ = "" 569 593 if (v.steps) { 570 594 //console.log(v,v.trackingCode) 571 595 document.getElementById('steps').value = v.steps; 572 596 document.getElementById('form_name').value = v.formName; 597 if(formName_ws!="login" && formName_ws!="register" && v.trackingCode) document.getElementById('trackingcode_emsFormBuilder').checked = v.trackingCode=="true" ? true :false; 573 598 createSteps(); 574 599 for (let i = 1; i <= v.steps; i++) { … … 959 984 960 985 // check value of maxstep get from user (Start) 961 const form_name = document.getElementById("form_name").value;986 const form_name = document.getElementById("form_name").value; 962 987 const c = (document.getElementById("steps").value < 3 && document.getElementById("steps").value > 0 && !pro_ws) || (pro_ws && document.getElementById("steps").value <21 && document.getElementById("steps").value > 0 ) ? document.getElementById("steps").value : -1 963 988 if (c != -1) { … … 1068 1093 1069 1094 //emsfb version of form creator emsfb:1 , 1070 const ob = {steps: stepMax_ws, [`${name}-${no}`]: el.value, formName: formName_ws,EfbVersion:1. 2,type:form_type_emsFormBuilder}1095 const ob = {steps: stepMax_ws, [`${name}-${no}`]: el.value, formName: formName_ws,EfbVersion:1.3,type:form_type_emsFormBuilder,trackingCode:trackingCode_efb } 1071 1096 //console.log(ob); 1072 1097 … … 1279 1304 document.getElementById('emsFormBuilder-text-message-view').innerHTML = `<h1 class='emsFormBuilder'><i class="fas fa-thumbs-up faa-bounce animated text-primary""></i></h1><h1 class='emsFormBuilder'>${efb_var.text.done}</h1></br> <span>${efb_var.text.goodJob}, ${efb_var.text.formIsBuild} </span></br></br> <h3>${efb_var.text.formCode}: <b>${res.data.value}</b><h3></br> <input type="text" class="emsFormBuilder" value="${res.data.value}"> `; 1280 1305 localStorage.removeItem('valueJson_ws_p'); 1306 localStorage.removeItem('rows_ws_p'); 1307 localStorage.removeItem('sendback'); 1308 localStorage.removeItem('Edit_ws_form'); 1309 localStorage.removeItem('valueJson_ws_messages'); 1310 localStorage.removeItem('head_ws_p'); 1311 localStorage.removeItem('valueJson_ws_p'); 1281 1312 }else{ 1282 1313 alert(res , "error") … … 1289 1320 }else if(res.data.r=="update" && res.data.success==true){ 1290 1321 document.getElementById('emsFormBuilder-text-message-view').innerHTML = `<h1 class='emsFormBuilder'><i class="fas fa-thumbs-up faa-bounce animated text-primary""></i></h1><h1 class='emsFormBuilder'>${efb_var.text.formUpdated}</h1></br> <span>${efb_var.text.goodJob}, ${efb_var.text.formUpdatedDone}</span></br></br> <h3>${efb_var.text.formCode}: <b>${res.data.value}</b><h3></br> <input type="text" class="emsFormBuilder" value="${res.data.value}"> `; 1322 localStorage.removeItem('valueJson_ws_p'); 1323 localStorage.removeItem('rows_ws_p'); 1324 localStorage.removeItem('sendback'); 1325 localStorage.removeItem('Edit_ws_form'); 1326 localStorage.removeItem('valueJson_ws_messages'); 1327 localStorage.removeItem('head_ws_p'); 1291 1328 localStorage.removeItem('valueJson_ws_p'); 1292 1329 document.getElementById('back_emsFormBuilder').removeAttribute("onclick"); … … 1439 1476 1440 1477 function add_form_builder_emsFormBuilder (){ 1478 console.log(formName_ws); 1441 1479 const value =` 1442 1480 <div class="m-4"> … … 1462 1500 </br> 1463 1501 <h5> ${efb_var.text.numberSteps}: *</h5> 1464 <input placeholder="1,2,3.." type="number" name="setps" class="require emsFormBuilder" id="steps" max="20"> 1502 <input placeholder="1,2,3.." type="number" name="setps" class="require emsFormBuilder" id="steps" max="20"> 1503 <div class="form-group mx-3"> 1504 </br> 1505 <input type="checkbox" class="form-check-input emsFormBuilder" ${formName_ws!="login" && formName_ws!="register" ? `id="trackingcode_emsFormBuilder" ` :`disabled` } > 1506 <label class="form-check-label" for="trackingcode_emsFormBuilder">${efb_var.text.showTrackingCode}</label> 1507 </div> 1465 1508 </div> 1466 1509 <div class="tab" id="tabInfo"> … … 1553 1596 form_type_emsFormBuilder="form"; 1554 1597 formName_ws = efb_var.text.contactUs 1555 const json =[{"steps": "1","name-1": efb_var.text.contactUs,"formName":efb_var.text.contactUs,"EfbVersion": 1. 2,"type": "contact","icon-1": "fa fa-envelope"},{"id_": "xnr4fjtik","name": efb_var.text.firstName,"type": "text","step": 1,"amount": 1,"required": true},{"id_": "ng98mihl7","name": efb_var.text.lastName,"type": "text","step": 1,"amount": 2,"required": true},{"id_": "ihfqg325b","name": efb_var.text.email,"type": "email","step": 1,"amount": 3,"required": true},{"id_": "x7cs8pqk6","name":efb_var.text.phone,"type": "tel","step": 1,"amount": 4},{"id_": "bd1i5oe9j","name": efb_var.text.message,"type": "textarea","step": 1,"amount": 5,"required": true}]1598 const json =[{"steps": "1","name-1": efb_var.text.contactUs,"formName":efb_var.text.contactUs,"EfbVersion": 1.3,"type": "contact","icon-1": "fa fa-envelope"},{"id_": "xnr4fjtik","name": efb_var.text.firstName,"type": "text","step": 1,"amount": 1,"required": true},{"id_": "ng98mihl7","name": efb_var.text.lastName,"type": "text","step": 1,"amount": 2,"required": true},{"id_": "ihfqg325b","name": efb_var.text.email,"type": "email","step": 1,"amount": 3,"required": true},{"id_": "x7cs8pqk6","name":efb_var.text.phone,"type": "tel","step": 1,"amount": 4},{"id_": "bd1i5oe9j","name": efb_var.text.message,"type": "textarea","step": 1,"amount": 5,"required": true}] 1556 1599 localStorage.setItem('valueJson_ws_p', JSON.stringify(json)) 1557 1600 valueJson_ws_p =json; … … 1560 1603 form_type_emsFormBuilder="register"; 1561 1604 formName_ws ="register"; 1562 json =[{"steps":"1","name-1":efb_var.text.register,"formName":efb_var.text.register,"EfbVersion":1. 2,"type":"register","icon-1":"fa fa-user-plus"},{"id_":"usernameRegisterEFB","name":efb_var.text.username,"type":"text","step":1,"amount":1,"required":true},{"id_":"emailRegisterEFB","name":efb_var.text.email,"type":"email","step":1,"amount":2,"required":true},{"id_":"passwordRegisterEFB","name":efb_var.text.password,"type":"password","step":1,"amount":3,"required":true}];1605 json =[{"steps":"1","name-1":efb_var.text.register,"formName":efb_var.text.register,"EfbVersion":1.3,"type":"register","icon-1":"fa fa-user-plus"},{"id_":"usernameRegisterEFB","name":efb_var.text.username,"type":"text","step":1,"amount":1,"required":true},{"id_":"emailRegisterEFB","name":efb_var.text.email,"type":"email","step":1,"amount":2,"required":true},{"id_":"passwordRegisterEFB","name":efb_var.text.password,"type":"password","step":1,"amount":3,"required":true}]; 1563 1606 valueJson_ws_p =json; 1564 1607 localStorage.setItem('valueJson_ws_p', JSON.stringify(json)) … … 1567 1610 form_type_emsFormBuilder="login"; 1568 1611 formName_ws =form_type_emsFormBuilder; 1569 json =[{"steps":"1","name-1":efb_var.text.login,"formName":efb_var.text.login,"EfbVersion":1. 2,"type":"login","icon-1":"fa fa-sign-in"},{"id_":"emaillogin","name":efb_var.text.emailOrUsername,"type":"text","step":1,"amount":1,"required":true},{"id_":"passwordlogin","name":efb_var.text.password,"type":"password","step":1,"amount":2,"required":true}];1612 json =[{"steps":"1","name-1":efb_var.text.login,"formName":efb_var.text.login,"EfbVersion":1.3,"type":"login","icon-1":"fa fa-sign-in"},{"id_":"emaillogin","name":efb_var.text.emailOrUsername,"type":"text","step":1,"amount":1,"required":true},{"id_":"passwordlogin","name":efb_var.text.password,"type":"password","step":1,"amount":2,"required":true}]; 1570 1613 valueJson_ws_p =json; 1571 1614 localStorage.setItem('valueJson_ws_p', JSON.stringify(json)) … … 1575 1618 form_type_emsFormBuilder="form"; 1576 1619 formName_ws =form_type_emsFormBuilder 1577 const json =[{"steps":"1","name-1":" ","formName":efb_var.text.support,"EfbVersion":1. 2,"type":"form","icon-1":"fa fa-support"},{"id_":"khlewd90v","required":true,"type":"multiselect","step":1,"amount":1,"name":"How can we help you?"},{"id_":"4polea9sp","name":"Accounting & Sell question","parents":"khlewd90v","type":"option","step":null},{"id_":"5o6k6epyd","name":"Technical & support question","parents":"khlewd90v","type":"option","step":null},{"id_":"sophw2b2q","name":"General question","parents":"khlewd90v","type":"option","step":null},{"id_":"4rcet7l27","name":efb_var.text.subject,"type":"text","step":1,"amount":2},{"id_":"0i98gvfyw","name":efb_var.text.message,"type":"textarea","step":1,"amount":3,"required": true}];1620 const json =[{"steps":"1","name-1":" ","formName":efb_var.text.support,"EfbVersion":1.3,"type":"form","icon-1":"fa fa-support"},{"id_":"khlewd90v","required":true,"type":"multiselect","step":1,"amount":1,"name":"How can we help you?"},{"id_":"4polea9sp","name":"Accounting & Sell question","parents":"khlewd90v","type":"option","step":null},{"id_":"5o6k6epyd","name":"Technical & support question","parents":"khlewd90v","type":"option","step":null},{"id_":"sophw2b2q","name":"General question","parents":"khlewd90v","type":"option","step":null},{"id_":"4rcet7l27","name":efb_var.text.subject,"type":"text","step":1,"amount":2},{"id_":"0i98gvfyw","name":efb_var.text.message,"type":"textarea","step":1,"amount":3,"required": true}]; 1578 1621 localStorage.setItem('valueJson_ws_p', JSON.stringify(json)) 1579 1622 valueJson_ws_p =json; … … 1582 1625 form_type_emsFormBuilder="subscribe"; 1583 1626 formName_ws = form_type_emsFormBuilder 1584 const json =[{"steps":"1","name-1":" ","formName":efb_var.text.subscribe,"EfbVersion":1. 2,"type":"subscribe","icon-1":"fa fa-bell"},{"id_":"92os2cfq22","name":efb_var.text.firstName,"type":"text","step":1,"amount":1,"required":false},{"id_":"92os2cfqc","name":efb_var.text.email,"type":"email","step":1,"amount":2,"required":true}];1627 const json =[{"steps":"1","name-1":" ","formName":efb_var.text.subscribe,"EfbVersion":1.3,"type":"subscribe","icon-1":"fa fa-bell"},{"id_":"92os2cfq22","name":efb_var.text.firstName,"type":"text","step":1,"amount":1,"required":false},{"id_":"92os2cfqc","name":efb_var.text.email,"type":"email","step":1,"amount":2,"required":true}]; 1585 1628 localStorage.setItem('valueJson_ws_p', JSON.stringify(json)) 1586 1629 valueJson_ws_p =json; … … 1588 1631 form_type_emsFormBuilder="survey"; 1589 1632 formName_ws = form_type_emsFormBuilder 1590 /* const json =[{"steps":"1","name-1":efb_var.text.survey,"formName":efb_var.text.survey,"EfbVersion":1. 2,"type":"survey","icon-1":"fa fa-bell"}];1633 /* const json =[{"steps":"1","name-1":efb_var.text.survey,"formName":efb_var.text.survey,"EfbVersion":1.3,"type":"survey","icon-1":"fa fa-bell"}]; 1591 1634 localStorage.setItem('valueJson_ws_p', JSON.stringify(json)) 1592 1635 valueJson_ws_p =json; */ -
easy-form-builder/trunk/includes/admin/assets/js/core.js
r2548693 r2556411 160 160 } 161 161 //console.log(`form_type_emsFormBuilder [${form_type_emsFormBuilder}]`); 162 console.log(form_type_emsFormBuilder,efb_var.text[form_type_emsFormBuilder] )162 //console.log(form_type_emsFormBuilder,efb_var.text[form_type_emsFormBuilder] ) 163 163 const button_name = form_type_emsFormBuilder!="form" ? efb_var.text[form_type_emsFormBuilder] : efb_var.text.send 164 164 const content = `<!-- commenet --!><div class="m-2"> -
easy-form-builder/trunk/includes/admin/assets/js/list_form.js
r2554444 r2556411 494 494 // تابع نمایش ویرایش فرم 495 495 function fun_ws_show_edit_form(id){ 496 trackingcode ='null'; 496 497 document.getElementById('emsFormBuilder-content').innerHTML=`<div class="col-md-12 "> 497 498 <div id="emsFormBuilder-form" > … … 516 517 <h5>${efb_var.text.numberOfSteps}:*</h5> 517 518 <input placeholder="1,2,3.." type="number" name="setps" class="require emsFormBuilder" id="steps" max="20"> 519 <div class="form-group mx-3"> 520 </br> 521 <input type="checkbox" class="form-check-input" id="trackingcode_emsFormBuilder" ${formName_ws!="login" && formName_ws!="register" ? `id="trackingcode_emsFormBuilder" ` :`disabled` }> 522 <label class="form-check-label" for="trackingcode_emsFormBuilder">${efb_var.text.showTrackingCode}</label> 523 </div> 518 524 </div> 519 525 <div class="tab" id="tabInfo"> … … 994 1000 <a class="btn btn btn-secondary" OnClick="clear_garbeg_emsFormBuilder()">${efb_var.text.clearUnnecessaryFiles}</a> 995 1001 </div> 1002 <!-- 996 1003 <div class="py-2"> 997 1004 <h6 class="border-bottom border-info mx-3 mt-2 " aria-describedby="TrackingCodeHelp">${efb_var.text.trackingCode}<h6> … … 1000 1007 <input type="checkbox" class="form-check-input" id="trackingcode_emsFormBuilder" ${trackingcode!=="null" && ( trackingcode=="true" || trackingcode===true)? `checked` :"" }> 1001 1008 <label class="form-check-label" for="trackingcode_emsFormBuilder">${efb_var.text.showTrackingCode}</label> 1002 </div> 1009 </div> 1003 1010 </div> 1011 --> 1004 1012 <div class="py-2"> 1005 1013 <h6 class="border-bottom border-info mx-3 mt-2 " aria-describedby="shortCodeHelp">${efb_var.text.trackingCodeFinder}<h6> -
easy-form-builder/trunk/includes/admin/class-Emsfb-create.php
r2520621 r2556411 115 115 )); 116 116 } 117 117 118 118 $lang = [ 119 119 "create" => __('Create','easy-form-builder'), … … 266 266 "register" => __('Register'), 267 267 "username" => __('Username'), 268 268 "showTrackingCode" => __('Show tracking Code','easy-form-builder'), 269 269 "allStep" => __('all step','easy-form-builder'), 270 270 "please" => __('Please','easy-form-builder'), -
easy-form-builder/trunk/includes/class-Emsfb-public.php
r2550541 r2556411 580 580 581 581 $user = wp_signon( $creds, false ); 582 582 583 if(isset($user->ID)){ 583 584 //user login in successfully -
easy-form-builder/trunk/public/assets/js/core.js
r2554444 r2556411 45 45 if(ajax_object_efm.type!="userIsLogin"){ 46 46 const vs=JSON.parse(ajax_object_efm.form_setting.replace(/[\\]/g, '')); 47 47 console.log(vs) 48 console.log(vs.trackingCode); 48 49 sitekye_emsFormBuilder =vs.siteKey; 49 50 trackingCode_state_emsFormBuilder =vs.trackingCode; … … 357 358 if(valueJson_ws== undefined) {valueJson_ws="N"; return 0;} 358 359 formName = valueJson_ws[0].formName 360 if(valueJson_ws[0].EfbVersion<1.3) trackingCode_state_emsFormBuilder =valueJson_ws[0].trackingCode ; 361 console.log(valueJson_ws[0]); 362 console 359 363 console.log(valueJson_ws[0].steps); 360 364 for (let v of valueJson_ws) { … … 1894 1898 <p>${ob.user_login}</p> 1895 1899 1896 <button type="button" class="btn btn-lg btn-block mat-shadow emsFormBuilder btn-type-efb " onclick="emsFormBuilder_logout()">${ajax_object_efm.text.logout}</button>1900 <button type="button" class="btn btn-lg btn-block mat-shadow-efb btn-type-efb btn-lg-efb " onclick="emsFormBuilder_logout()">${ajax_object_efm.text.logout}</button> 1897 1901 </div> 1898 1902 </div> … … 1989 1993 case 'login': 1990 1994 1991 1995 console.log(res.data); 1992 1996 if(res.data.m.state==true){ 1993 1997 //console.log(res.data); -
easy-form-builder/trunk/readme.txt
r2554444 r2556411 3 3 Tags: form builder, form creator, contact form, support form, subscribe form 4 4 Donate link: https://ko-fi.com/whitestudio 5 Stable tag: 1.33. 65 Stable tag: 1.33.7 6 6 Requires at least: 4.7 7 7 Tested up to: 5.7.2 … … 92 92 93 93 == Changelog == 94 95 = 1.33.5 = 94 = 1.33.7 = 95 * Change location of show trackingCode of forms from setting to create/edit form pages 96 97 = 1.33.6 = 96 98 * Fixed issues about form validation 97 99
Note: See TracChangeset
for help on using the changeset viewer.