Skip to content

Commit

Permalink
Cookies & GDPR
Browse files Browse the repository at this point in the history
  • Loading branch information
@patriksh
patriksh committed Oct 7, 2021
1 parent e16011b commit 51dec10
Show file tree
Hide file tree
Showing 19 changed files with 526 additions and 10 deletions.
177 changes: 177 additions & 0 deletions oc-admin/themes/modern/settings/cookiesgdpr.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
<?php if (!defined('OC_ADMIN')) {
exit('Direct access is not allowed.');
}
/*
* Osclass - software for creating and publishing online classified advertising platforms
* Maintained and supported by Mindstellar Community
* https://github.com/mindstellar/Osclass
* Copyright (c) 2021. Mindstellar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* GNU GENERAL PUBLIC LICENSE
* Version 3, 29 June 2007
*
* Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
*
* You should have received a copy of the GNU Affero General Public
* License along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

function addHelp()
{
echo '<p>' . __("Modify the options that allow your users to publish comments on your site's listings.") . '</p>';
}
osc_add_hook('help_box', 'addHelp');

function customPageHeader()
{
?>
<h1><?php _e('Settings'); ?>
<a class="ms-1 bi bi-question-circle-fill float-right" data-bs-target="#help-box" data-bs-toggle="collapse"
href="#help-box"></a>
</h1>
<?php
}
osc_add_hook('admin_page_header', 'customPageHeader');

function customPageTitle($string)
{
return sprintf(__('Cookies & GDPR Settings &raquo; %s'), $string);
}
osc_add_filter('admin_title', 'customPageTitle');

osc_current_admin_theme_path('parts/header.php');
?>
<div id="general-settings">
<form name="cookiesgdpr_form" action="<?php echo osc_admin_base_url(true); ?>" method="post">
<input type="hidden" name="page" value="settings"/>
<input type="hidden" name="action" value="cookiesgdpr_post"/>
<fieldset>
<div class="form-horizontal">
<h2 class="render-title"><?php _e('Cookie Settings'); ?></h2>
<div class="form-row">
<div class="form-label"><?php _e('Enable consent'); ?></div>
<div class="form-controls">
<div class="form-label-checkbox">
<label>
<input type="checkbox" <?php echo(osc_cookie_consent_enabled() ? 'checked="checked"' : ''); ?>
name="cookie_consent_enabled"
value="1"/> <?php _e('Show cookie consent to users'); ?>
</label>
</div>
</div>
</div>
<div class="form-row">
<div class="form-label"><?php _e('Non-mandatory cookies'); ?></div>
<div class="form-controls">
<div class="form-label-checkbox">
<label>
<input type="checkbox" <?php echo(osc_cookie_consent_nonmandatory() ? 'checked="checked"' : ''); ?>
name="cookie_consent_nonmandatory"
value="1"/> <?php _e('Allow users to opt-out from non-mandatory cookies (like Google Analytics)'); ?>
</label>
</div>
</div>
</div>
<div class="form-row">
<div class="form-label"><?php _e('Cookie policy URL'); ?></div>
<div class="form-controls">
<input type="text" name="cookie_consent_url" list="staticpages" value="<?php echo osc_esc_html(osc_cookie_consent_url()); ?>"/>
<datalist id="staticpages">
<?php osc_reset_static_pages(); ?>
<?php while(osc_has_static_pages()) { ?>
<option value="<?php echo osc_static_page_url(); ?>" <?php echo $selected; ?>><?php echo osc_static_page_title();?></option>
<?php } ?>
</datalist>
</div>
</div>

<h2 class="render-title separate-top"><?php _e('GDPR Settings'); ?></h2>
<div class="form-row">
<div class="form-label"><?php _e('Right to be forgotten') ?></div>
<div class="form-controls">
<div class="form-label-checkbox">
<label>
<input type="checkbox" <?php echo(osc_gdpr_delete_enabled() ? 'checked="checked"'
: ''); ?> name="gdpr_delete_enabled"
value="1"/> <?php _e('Show "Delete account" link in user menu'); ?>
</label>
</div>
<div class="help-box">
<?php _e('Some themes already show this link.'); ?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-label"><?php _e('Right to data portability') ?></div>
<div class="form-controls">
<div class="form-label-checkbox">
<label>
<input type="checkbox" <?php echo(osc_gdpr_download_enabled() ? 'checked="checked"'
: ''); ?> name="gdpr_download_enabled"
value="1"/> <?php _e('Show "Download data" link in user menu'); ?>
</label>
</div>
</div>
</div>
<div class="form-row">
<div class="form-label"><?php _e('Checkboxes') ?></div>
<div class="form-controls">
<div class="form-label-checkbox">
<label>
<input type="checkbox" <?php echo(osc_gdpr_checkboxes_enabled() ? 'checked="checked"'
: ''); ?> name="gdpr_checkboxes_enabled"
value="1"/> <?php _e('Show checkboxes for "Terms and conditions" and "Privacy policy" to users'); ?>
</label>
</div>
<div class="help-box">
<?php _e("Once checked once, the checkboxes won't be shown anymore to the user."); ?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-label"><?php _e('Terms and conditions page'); ?></div>
<div class="form-controls">
<select class="form-select form-select-sm " name="gdpr_terms_page">
<option value="0" selected="selected"><?php _e('Select a page...'); ?></option>
<?php osc_reset_static_pages(); ?>
<?php while(osc_has_static_pages()) { ?>
<?php $selected = (osc_gdpr_terms_page() == osc_static_page_id()) ? 'selected' : ''; ?>
<option value="<?php echo osc_static_page_id(); ?>" <?php echo $selected; ?>><?php echo osc_static_page_title();?></option>
<?php } ?>
</select>
</div>
</div>
<div class="form-row">
<div class="form-label"><?php _e('Privacy policy page'); ?></div>
<div class="form-controls">
<select class="form-select form-select-sm " name="gdpr_privacy_page">
<option value="0" selected="selected"><?php _e('Select a page...'); ?></option>
<?php osc_reset_static_pages(); ?>
<?php while(osc_has_static_pages()) { ?>
<?php $selected = (osc_gdpr_privacy_page() == osc_static_page_id()) ? 'selected' : ''; ?>
<option value="<?php echo osc_static_page_id(); ?>" <?php echo $selected; ?>><?php echo osc_static_page_title();?></option>
<?php } ?>
</select>
</div>
</div>
<div class="form-actions">
<input type="submit" id="save_changes" value="<?php echo osc_esc_html(__('Save changes')); ?>"
class="btn btn-submit"/>
</div>
</div>
</fieldset>
</form>
</div>
<?php osc_current_admin_theme_path('parts/footer.php'); ?>
9 changes: 9 additions & 0 deletions oc-includes/assets/cookieconsent/LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
MIT License

Copyright (c) 2019 Osano, Inc., A Public Benefit Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6 changes: 6 additions & 0 deletions oc-includes/assets/cookieconsent/cookieconsent.min.css
View file

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

1 change: 1 addition & 0 deletions oc-includes/assets/cookieconsent/cookieconsent.min.js
View file

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions oc-includes/osclass/classes/AdminMenu.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,13 @@ public function init()
'settings_searches',
'administrator'
);
$this->add_submenu(
'settings',
__('Cookies & GDPR'),
osc_admin_base_url(true) . '?page=settings&action=cookiesgdpr',
'settings_cookiesgdpr',
'administrator'
);
$this->add_submenu(
'settings',
__('Advanced'),
Expand Down
5 changes: 5 additions & 0 deletions oc-includes/osclass/classes/controller/CWebUser.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,11 @@ public function doModel()
$this->redirectTo(osc_base_url());
}
break;
case 'gdpr_download':
fn_email_gdpr_download(osc_logged_user_id());
osc_add_flash_ok_message(_m('Your data has been sent to your email address'));
$this->redirectTo(osc_user_dashboard_url());
break;
}
}

Expand Down
4 changes: 4 additions & 0 deletions oc-includes/osclass/classes/controller/admin/CAdminSettings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ public function doModel()
case ('latestsearches_post'):
$do = new CAdminSettingsLatestSearches();
break;
case ('cookiesgdpr'):
case ('cookiesgdpr_post'):
$do = new CAdminSettingsCookiesGDPR();
break;
case ('update'):
case ('check_updates'):
default:
Expand Down
78 changes: 78 additions & 0 deletions oc-includes/osclass/classes/controller/admin/settings/CAdminSettingsCookiesGDPR.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?php

if (!defined('ABS_PATH')) {
exit('ABS_PATH is not loaded. Direct access is not allowed.');
}

/*
* Osclass - software for creating and publishing online classified advertising platforms
* Maintained and supported by Mindstellar Community
* https://github.com/mindstellar/Osclass
* Copyright (c) 2021. Mindstellar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* GNU GENERAL PUBLIC LICENSE
* Version 3, 29 June 2007
*
* Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
* Everyone is permitted to copy and distribute verbatim copies
* of this license document, but changing it is not allowed.
*
* You should have received a copy of the GNU Affero General Public
* License along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

/**
* Class CAdminSettingsCookiesGDPR
*/
class CAdminSettingsCookiesGDPR extends AdminSecBaseModel
{

public function __construct()
{
parent::__construct();
osc_run_hook('init_admin_settings_cookiesgdpr');
}

//Business Layer...
public function doModel()
{
switch ($this->action) {
case ('cookiesgdpr'):
// calling the settings view
$this->_exportVariableToView('pages', Page::newInstance()->listAll(false));
$this->doView('settings/cookiesgdpr.php');
break;
case ('cookiesgdpr_post'):
// updating settings
osc_csrf_check();

$iUpdated = 0;
$iUpdated += osc_set_preference('cookie_consent_enabled', (bool) Params::getParam('cookie_consent_enabled'));
$iUpdated += osc_set_preference('cookie_consent_nonmandatory', (bool) Params::getParam('cookie_consent_nonmandatory'));
$iUpdated += osc_set_preference('cookie_consent_url', trim(strip_tags(Params::getParam('cookie_consent_url'))));
$iUpdated += osc_set_preference('gdpr_delete_enabled', (bool) Params::getParam('gdpr_delete_enabled'));
$iUpdated += osc_set_preference('gdpr_download_enabled', (bool) Params::getParam('gdpr_download_enabled'));
$iUpdated += osc_set_preference('gdpr_checkboxes_enabled', (bool) Params::getParam('gdpr_checkboxes_enabled'));
$iUpdated += osc_set_preference('gdpr_terms_page', (int) Params::getParam('gdpr_terms_page'));
$iUpdated += osc_set_preference('gdpr_privacy_page', (int) Params::getParam('gdpr_privacy_page'));

if ($iUpdated > 0) {
osc_add_flash_ok_message(_m('Cookie & GDPR settings have been updated'), 'admin');
}
$this->redirectTo(osc_admin_base_url(true) . '?page=settings&action=cookiesgdpr');
break;
}
}
}

// EOF: ./oc-admin/controller/settings/CAdminSettingsCookiesGDPR.php
Loading

0 comments on commit 51dec10

Please sign in to comment.