chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Legal and terms updates see BT#11196

Browse Source 
Add setting show_terms_if_profile_completed
Add user.profile_completed
pull/2487/head
jmontoyaa 9 years ago
parent 2b2a28148f
commit c1d9cee3c4
5 changed files with 132 additions and 52 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      main/admin/legal_add.php
  2. 135
      main/auth/inscription.php
  3. 4
      main/inc/lib/api.lib.php
  4. 7
      main/install/data.sql
  5. 35
      src/Chamilo/UserBundle/Entity/User.php

3
main/admin/legal_add.php
Unescape View File

@ -68,7 +68,7 @@ if ($form->validate()) {
exit();
} elseif ($submit=='preview') {
$defaults['type'] = $type;
$defaults['content'] = LegalManager::replaceTags($content);
$defaults['content'] = $content;
$defaults['changes'] = $changes;
$term_preview = $defaults;
$term_preview['type'] = intval($_POST['type']);
@ -122,6 +122,7 @@ if (isset($_POST['language'])) {
$preview = LegalManager::show_last_condition($term_preview);
if ($term_preview['type'] != -1) {
$preview = LegalManager::replaceTags($preview);
$form->addElement('label', get_lang('Preview'), $preview);
}

135
main/auth/inscription.php
Unescape View File

@ -123,8 +123,7 @@ function initializeGeo(address, latLng) {
// User is not allowed if Terms and Conditions are disabled and
// registration is disabled too.
$isNotAllowedHere = api_get_setting('allow_terms_conditions') === 'false' &&
api_get_setting('allow_registration') === 'false';
$isNotAllowedHere = api_get_setting('allow_terms_conditions') === 'false' && api_get_setting('allow_registration') === 'false';
if ($isNotAllowedHere) {
api_not_allowed(true, get_lang('RegistrationDisabled'));
@ -140,10 +139,9 @@ if (!empty($_SESSION['user_language_choice'])) {
$form = new FormValidator('registration');
$user_already_registered_show_terms = false;
if (api_get_setting('allow_terms_conditions') == 'true') {
$user_already_registered_show_terms = isset($_SESSION['term_and_condition']['user_id']);
} else {
$user_already_registered_show_terms = false;
}
// Direct Link Subscription feature #5299
@ -155,7 +153,7 @@ if (!empty($course_code_redirect)) {
Session::write('exercise_redirect', $exercise_redirect);
}
if ($user_already_registered_show_terms == false) {
if ($user_already_registered_show_terms === false) {
if (api_is_western_name_order()) {
// FIRST NAME and LAST NAME
$form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
@ -171,11 +169,11 @@ if ($user_already_registered_show_terms == false) {
// EMAIL
$form->addElement('text', 'email', get_lang('Email'), array('size' => 40));
if (api_get_setting('registration', 'email') == 'true') {
if (api_get_setting('registration', 'email') === 'true') {
$form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
}
if (api_get_setting('login_is_email') == 'true') {
if (api_get_setting('login_is_email') === 'true') {
$form->applyFilter('email', 'trim');
if (api_get_setting('registration', 'email') != 'true') {
$form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
@ -185,7 +183,7 @@ if ($user_already_registered_show_terms == false) {
}
$form->addRule('email', get_lang('EmailWrong'), 'email');
if (api_get_setting('openid_authentication') == 'true') {
if (api_get_setting('openid_authentication') === 'true') {
$form->addElement('text', 'openid', get_lang('OpenIDURL'), array('size' => 40));
}
@ -219,14 +217,24 @@ if ($user_already_registered_show_terms == false) {
}
// PASSWORD
$form->addElement('password', 'pass1', get_lang('Pass'), array('id' => 'pass1', 'size' => 20, 'autocomplete' => 'off'));
$form->addElement(
'password',
'pass1',
get_lang('Pass'),
array('id' => 'pass1', 'size' => 20, 'autocomplete' => 'off')
);
$checkPass = api_get_setting('allow_strength_pass_checker');
if ($checkPass == 'true') {
$form->addElement('label', null, '<div id="password_progress"></div>');
}
$form->addElement('password', 'pass2', get_lang('Confirmation'), array('id' => 'pass2', 'size' => 20, 'autocomplete' => 'off'));
$form->addElement(
'password',
'pass2',
get_lang('Confirmation'),
array('id' => 'pass2', 'size' => 20, 'autocomplete' => 'off')
);
$form->addRule('pass1', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('pass2', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule(array('pass1', 'pass2'), get_lang('PassTwo'), 'compare');
@ -257,7 +265,7 @@ if ($user_already_registered_show_terms == false) {
}
}
// Geolocation
// Geo location
if (in_array('address', $allowedFields)) {
$form->addElement('text', 'address', get_lang('AddressField'), ['id' => 'address']);
$form->addHtml('
@ -283,7 +291,7 @@ if ($user_already_registered_show_terms == false) {
');
}
// LANGUAGE
// Language
if (in_array('language', $allowedFields)) {
if (api_get_setting('registration', 'language') == 'true') {
$form->addElement(
@ -315,20 +323,20 @@ if ($user_already_registered_show_terms == false) {
}
$captcha = api_get_setting('allow_captcha');
$allowCaptcha = $captcha == 'true';
$allowCaptcha = $captcha === 'true';
if ($allowCaptcha) {
$ajax = api_get_path(WEB_AJAX_PATH).'form.ajax.php?a=get_captcha';
$options = array(
'width' => 220,
'height' => 90,
'callback' => $ajax.'&var='.basename(__FILE__, '.php'),
'sessionVar' => basename(__FILE__, '.php'),
'width' => 220,
'height' => 90,
'callback' => $ajax.'&var='.basename(__FILE__, '.php'),
'sessionVar' => basename(__FILE__, '.php'),
'imageOptions' => array(
'font_size' => 20,
'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
'font_path' => api_get_path(SYS_FONTS_PATH).'opensans/',
'font_file' => 'OpenSans-Regular.ttf',
//'output' => 'gif'
//'output' => 'gif'
)
);
@ -345,41 +353,65 @@ if ($user_already_registered_show_terms == false) {
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mycomptetences') == 'true'
) {
$form->addHtmlEditor('competences', get_lang('MyCompetences'), false, false, array('ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130'));
$form->addHtmlEditor(
'competences',
get_lang('MyCompetences'),
false,
false,
array('ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130')
);
}
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mydiplomas') == 'true'
) {
$form->addHtmlEditor('diplomas', get_lang('MyDiplomas'), false, false, array('ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130'));
$form->addHtmlEditor(
'diplomas',
get_lang('MyDiplomas'),
false,
false,
array('ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130')
);
}
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'myteach') == 'true'
) {
$form->addHtmlEditor('teach', get_lang('MyTeach'), false, false, array('ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130'));
$form->addHtmlEditor(
'teach',
get_lang('MyTeach'),
false,
false,
array('ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130')
);
}
if (api_get_setting('extended_profile') == 'true' &&
api_get_setting('extendedprofile_registration', 'mypersonalopenarea') == 'true'
) {
$form->addHtmlEditor('openarea', get_lang('MyPersonalOpenArea'), false, false, array('ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130'));
$form->addHtmlEditor(
'openarea',
get_lang('MyPersonalOpenArea'),
false,
false,
array('ToolbarSet' => 'register', 'Width' => '100%', 'Height' => '130')
);
}
if (api_get_setting('extended_profile') == 'true') {
if (api_get_setting('extendedprofile_registration', 'mycomptetences') == 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'mycomptetences') == 'true'
if (api_get_setting('extended_profile') === 'true') {
if (api_get_setting('extendedprofile_registration', 'mycomptetences') === 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'mycomptetences') === 'true'
) {
$form->addRule('competences', get_lang('ThisFieldIsRequired'), 'required');
}
if (api_get_setting('extendedprofile_registration', 'mydiplomas') == 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'mydiplomas') == 'true'
if (api_get_setting('extendedprofile_registration', 'mydiplomas') === 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'mydiplomas') === 'true'
) {
$form->addRule('diplomas', get_lang('ThisFieldIsRequired'), 'required');
}
if (api_get_setting('extendedprofile_registration', 'myteach') == 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'myteach') == 'true'
if (api_get_setting('extendedprofile_registration', 'myteach') === 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'myteach') === 'true'
) {
$form->addRule('teach', get_lang('ThisFieldIsRequired'), 'required');
}
if (api_get_setting('extendedprofile_registration', 'mypersonalopenarea') == 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'mypersonalopenarea') == 'true'
if (api_get_setting('extendedprofile_registration', 'mypersonalopenarea') === 'true' &&
api_get_setting('extendedprofile_registrationrequired', 'mypersonalopenarea') === 'true'
) {
$form->addRule('openarea', get_lang('ThisFieldIsRequired'), 'required');
}
@ -391,7 +423,6 @@ if ($user_already_registered_show_terms == false) {
$returnParams = $extraField->addElements($form);
}
}
if (isset($_SESSION['user_language_choice']) && $_SESSION['user_language_choice'] != '') {
$defaults['language'] = $_SESSION['user_language_choice'];
} else {
@ -408,7 +439,7 @@ if (!empty($_GET['phone'])) {
$defaults['phone'] = Security::remove_XSS($_GET['phone']);
}
if (api_get_setting('openid_authentication') == 'true' && !empty($_GET['openid'])) {
if (api_get_setting('openid_authentication') === 'true' && !empty($_GET['openid'])) {
$defaults['openid'] = Security::remove_XSS($_GET['openid']);
}
@ -423,7 +454,7 @@ $content = null;
if (!CustomPages::enabled()) {
// Load terms & conditions from the current lang
if (api_get_setting('allow_terms_conditions') == 'true') {
if (api_get_setting('allow_terms_conditions') === 'true') {
$get = array_keys($_GET);
if (isset($get)) {
if (isset($get[0]) && $get[0] == 'legal') {
@ -496,6 +527,18 @@ if (!CustomPages::enabled()) {
// Terms and conditions
if (api_get_setting('allow_terms_conditions') == 'true') {
if (!api_is_platform_admin()) {
if (api_get_setting('show_terms_if_profile_completed') === 'true') {
$userInfo = api_get_user_info();
if ($userInfo) {
if ((int)$userInfo['profile_completed'] !== 1) {
api_not_allowed(true);
}
}
}
}
$language = api_get_interface_language();
$language = api_get_language_id($language);
$term_preview = LegalManager::get_last_condition($language);
@ -516,9 +559,8 @@ if (api_get_setting('allow_terms_conditions') == 'true') {
// Version and language
$form->addElement('hidden', 'legal_accept_type', $term_preview['version'].':'.$term_preview['language_id']);
$form->addElement('hidden', 'legal_info', $term_preview['id'].':'.$term_preview['language_id']);
$form->addElement('hidden', 'legal_course_id', api_get_course_int_id());
if ($term_preview['type'] == 1) {
if ($term_preview['type'] === 1) {
$form->addElement(
'checkbox',
'legal_accept',
@ -750,7 +792,7 @@ if ($form->validate()) {
}
// Terms & Conditions
if (api_get_setting('allow_terms_conditions') == 'true') {
if (api_get_setting('allow_terms_conditions') === 'true') {
// Update the terms & conditions.
if (isset($values['legal_accept_type'])) {
$cond_array = explode(':', $values['legal_accept_type']);
@ -758,6 +800,22 @@ if ($form->validate()) {
$time = time();
$condition_to_save = intval($cond_array[0]).':'.intval($cond_array[1]).':'.$time;
UserManager::update_extra_field_value($user_id, 'legal_accept', $condition_to_save);
$bossList = UserManager::getStudentBossList($user_id);
if ($bossList) {
$bossList = array_column($bossList, 'boss_id');
$currentUserInfo = api_get_user_info($user_id);
foreach ($bossList as $bossId) {
$subjectEmail = sprintf(get_lang('UserXSignedTheAgreement'), $currentUserInfo['complete_name']);
$contentEmail = sprintf(
get_lang('UserXSignedTheAgreementTheY'),
$currentUserInfo['complete_name'],
api_get_local_time($time)
);
MessageManager::send_message_simple($bossId, $subjectEmail, $contentEmail);
}
}
}
}
$values = api_get_user_info($user_id);
@ -892,7 +950,6 @@ if ($form->validate()) {
CustomPages::REGISTRATION, array('form' => $form)
);
} else {
if (!api_is_anonymous()) {
// Saving user to course if it was set.
if (!empty($course_code_redirect)) {

4
main/inc/lib/api.lib.php
Unescape View File

@ -1331,6 +1331,8 @@ function _api_format_user($user, $add_password = false)
$result['password'] = $user['password'];
}
$result['profile_completed'] = $user['profile_completed'];
$result['profile_url'] = api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user_id;
if (isset($user['extra'])) {
@ -1360,7 +1362,6 @@ function api_get_user_info(
$loadExtraData = false,
$loadOnlyVisibleExtraData = false
) {
if (empty($user_id)) {
$userFromSession = Session::read('_user');
if (isset($userFromSession)) {
@ -1370,7 +1371,6 @@ function api_get_user_info(
return false;
}
$sql = "SELECT * FROM ".Database :: get_main_table(TABLE_MAIN_USER)."
WHERE id='".intval($user_id)."'";
$result = Database::query($sql);

7
main/install/data.sql
Unescape View File

@ -313,7 +313,8 @@ VALUES
('ticket_send_warning_to_all_admins', NULL, 'radio','Ticket', 'false','TicketSendWarningToAllAdminsTitle','TicketSendWarningToAllAdminsComment',NULL,NULL, 0),
('ticket_warn_admin_no_user_in_category', NULL, 'radio','Ticket', 'false','TicketWarnAdminNoUserInCategoryTitle','TicketWarnAdminNoUserInCategoryComment',NULL,NULL, 0),
('ticket_allow_category_edition', NULL, 'radio','Ticket', 'false','TicketAllowCategoryEditionTitle','TicketAllowCategoryEditionComment',NULL,NULL, 0),
('load_term_conditions_section', NULL, 'radio','Platform', 'login','LoadTermConditionsSectionTitle','LoadTermConditionsSectionDescription',NULL,NULL, 0);
('load_term_conditions_section', NULL, 'radio','Platform', 'login','LoadTermConditionsSectionTitle','LoadTermConditionsSectionDescription',NULL,NULL, 0),
('show_terms_if_profile_completed', NULL, 'radio','Ticket', 'false','ShowTermsIfProfileCompletedTitle','ShowTermsIfProfileCompletedComment',NULL,NULL, 0);
INSERT INTO settings_options (variable, value, display_text)
VALUES
@ -643,7 +644,9 @@ VALUES
('ticket_warn_admin_no_user_in_category', 'true', 'Yes'),
('ticket_warn_admin_no_user_in_category', 'false', 'No'),
('load_term_conditions_section', 'login', 'Login'),
('load_term_conditions_section', 'course', 'Course');
('load_term_conditions_section', 'course', 'Course'),
('show_terms_if_profile_completed', 'true', 'Yes'),
('show_terms_if_profile_completed', 'false', 'No');
INSERT INTO language (original_name, english_name, isocode, dokeos_folder, available) VALUES
('&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;','arabic','ar','arabic',0),

35
src/Chamilo/UserBundle/Entity/User.php
Unescape View File

@ -1,13 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* User Entity
*
* @package chamilo.User
*/
namespace Chamilo\UserBundle\Entity;
use Chamilo\CoreBundle\Entity\ExtraFieldValues;
@ -193,7 +186,7 @@ class User implements UserInterface //implements ParticipantInterface, ThemeUser
*
* @ORM\Column(name="address", type="string", length=250, nullable=true, unique=false)
*/
private $address;
protected $address;
/**
* Vich\UploadableField(mapping="user_image", fileNameProperty="picture_uri")
@ -397,6 +390,13 @@ class User implements UserInterface //implements ParticipantInterface, ThemeUser
*/
protected $roles;
/**
* @var boolean
*
* @ORM\Column(name="profile_completed", type="boolean", nullable=true)
*/
protected $profileCompleted;
/**
* @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\JuryMembers", mappedBy="user")
**/
@ -2507,4 +2507,23 @@ class User implements UserInterface //implements ParticipantInterface, ThemeUser
return true;
}
}
/**
* @return bool
*/
public function isProfileCompleted()
{
return $this->profileCompleted;
}
/**
* @param mixed $profileCompleted
* @return User
*/
public function setProfileCompleted($profileCompleted)
{
$this->profileCompleted = $profileCompleted;
return $this;
}
}

Write Preview
Loading…
Cancel
Save