mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 11:36:08 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3404 from SimSync/fix_3375

Browse Source 
Fixes #3375 Added GDPR Agreement checkbox to contact form (incl. Lans)
This commit is contained in:
Cameron
2018-09-03 12:09:26 -07:00
committed by GitHub
parent b443409c3a 97aa3fb560
commit b09beceb4e
7 changed files with 92 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
e107_admin/prefs.php
View File

@@ -516,7 +516,8 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
<div class='smalltext field-help'>".PRFLAN_274."</div>
</td>
</tr>
<tr>
<tr>
<td><label for='contact-filter'>".PRFLAN_270."</label></td>
<td>
".$frm->textarea('contact_filter', $pref['contact_filter'], 5, 59, array('size'=>'xxlarge'))."
@@ -526,7 +527,6 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
<tr>
<td><label for='contact-emailcopy'>".PRFLAN_164."</label></td>
<td>";
@@ -550,6 +550,39 @@ $text .= "<fieldset class='e-hideme' id='core-prefs-email'>
</fieldset>";
// GDPR Settings -----------------------------
$text .= "
<fieldset class='e-hideme' id='core-prefs-gdpr'>
<legend>".PRFLAN_277."</legend>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tbody>
<tr>
<td><label for='gdpr-privacypolicy'>".PRFLAN_278."</label></td>
<td>
".$frm->text('gdpr_privacypolicy', $pref['gdpr_privacypolicy'], 200, array('size'=>'xxlarge'))."
<div class='smalltext field-help'>".PRFLAN_279."</div>
</td>
</tr>
<tr>
<td><label for='gdpr-termsandconditions'>".PRFLAN_280."</label></td>
<td>
".$frm->text('gdpr_termsandconditions', $pref['gdpr_termsandconditions'], 200, array('size'=>'xxlarge'))."
<div class='smalltext field-help'>".PRFLAN_281."</div>
</td>
</tr>
</tbody>
</table>
".pref_submit('display')."
</fieldset>
";
$text .= "
<fieldset class='e-hideme' id='core-prefs-display'>
<legend>".PRFLAN_13."</legend>
@@ -2043,6 +2076,7 @@ function prefs_adminmenu()
$var['core-prefs-header1']['header'] = LAN_BASIC_OPTIONS;
$var['core-prefs-main']['text'] = PRFLAN_1;
$var['core-prefs-email']['text'] = PRFLAN_254;
$var['core-prefs-gdpr']['text'] = PRFLAN_277;
$var['core-prefs-registration']['text'] = PRFLAN_28;
$var['core-prefs-signup']['text'] = PRFLAN_19;
// $var['core-prefs-sociallogin']['text'] = "Social Options"; // Moved into plugin.

16
e107_admin/update_routines.php
View File

@@ -599,15 +599,15 @@ function update_core_database($type = '')
$e_user_list = e107::getPref('e_user_list');
if(empty($e_user_list['user'])) // check e107_plugins/user/e_user.php is registered.
{
if($just_check)
{
return update_needed("user/e_user.php need to be registered"); // NO LAN.
}
e107::getPlug()->clearCache()->buildAddonPrefLists();
}
if(empty($e_user_list['user'])) // check e107_plugins/user/e_user.php is registered.
{
if($just_check)
{
return update_needed("user/e_user.php need to be registered"); // NO LAN.
}
}
// Make sure, that the pref "post_script" contains one of the allowed userclasses