mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3640 from SimSync/fix_3639

Browse Source 
fixes #3639: Added description to GDPR prefs
This commit is contained in:
Cameron
2019-01-24 13:11:19 -08:00
committed by GitHub
parent cd5b898f06 dada080d12
commit 62962b7716
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_admin/prefs.php
View File

@@ -575,6 +575,13 @@ $text .= "
<div class='smalltext field-help'>".PRFLAN_279."</div> <div class='smalltext field-help'>".PRFLAN_279."</div>
</td> </td>
</tr> </tr>
<tr>
<td><label>".LAN_DESCRIPTION."</label></td>
<td>
<div class='field-help'>".nl2br(PRFLAN_281)."</div>
</td>
</tr>
</tbody> </tbody>
</table> </table>
".pref_submit('display')." ".pref_submit('display')."

5
e107_core/shortcodes/batch/signup_shortcodes.php
View File

@@ -651,6 +651,11 @@ class signup_shortcodes extends e_shortcode
*/ */
function sc_signup_gdpr_info() function sc_signup_gdpr_info()
{ {
if (!e107::getPref('gdpr_termsandconditions', '') || !e107::getPref('gdpr_privacypolicy', ''))
{
return '';
}
$text = e107::getParser()->lanVars(LAN_SIGNUP_124, $text = e107::getParser()->lanVars(LAN_SIGNUP_124,
array($this->sc_signup_gdpr_privacypolicy_link(), $this->sc_signup_gdpr_termsandconditions_link())); array($this->sc_signup_gdpr_privacypolicy_link(), $this->sc_signup_gdpr_termsandconditions_link()));
return $text; return $text;

1
e107_languages/English/admin/lan_prefs.php
View File

@@ -300,3 +300,4 @@ define("PRFLAN_277", "GDPR Settings");
define("PRFLAN_278", "URL to the Privacy Policy"); define("PRFLAN_278", "URL to the Privacy Policy");
define("PRFLAN_279", "Make sure the url exists! It's best to use an absolute url. This setting will be used on all places that require a consent from the user (e.g. signup, contact form/menu, etc.)."); define("PRFLAN_279", "Make sure the url exists! It's best to use an absolute url. This setting will be used on all places that require a consent from the user (e.g. signup, contact form/menu, etc.).");
define("PRFLAN_280", "URL to the website terms and conditions"); define("PRFLAN_280", "URL to the website terms and conditions");
define("PRFLAN_281", "The 2 links above are used on various page on this site (e.g. signup and contact form/menu).\nPlease create 2 pages (if not already done) that contain your 'Privacy Policy' and the websites 'Terms and conditions'.\nThere are several websites that can generate those text for you.\nCopy the urls of this websites into the fields above (e.g. /page/privacy-policy or /page/terms-and-conditions).\nJust make sure, the pages and urls exist and are working!");