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

Minor legal corrections see #4851

Browse Source
skala
Julio Montoya 13 years ago
parent 2c77644773
commit 2b0e1fe851
3 changed files with 39 additions and 53 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. 33
      main/admin/legal_add.php
  2. 15
      main/admin/legal_list.php
  3. 44
      main/auth/inscription.php

33
main/admin/legal_add.php
Unescape View File

@ -37,8 +37,8 @@ if( $form->validate()) {
$submit = $values['send']; $submit = $values['send'];
} }
$default[content]=$content; $default['content']=$content;
if (isset($values['language'])){ if (isset($values['language'])) {
if($submit=='back') { if($submit=='back') {
header('Location: legal_add.php'); header('Location: legal_add.php');
exit; exit;
@ -87,28 +87,27 @@ $token = Security::get_token();
$form->addElement('hidden','sec_token'); $form->addElement('hidden','sec_token');
$form->setConstants(array('sec_token' => $token)); $form->setConstants(array('sec_token' => $token));
$form->addElement('label', null, get_lang('DisplayTermsConditions')); $form->addElement('header', get_lang('DisplayTermsConditions'));
if (isset($_POST['language'])) { if (isset($_POST['language'])) {
$form->addElement('static', Security::remove_XSS($_POST['language'])); $form->addElement('static', Security::remove_XSS($_POST['language']));
$form->addElement('hidden', 'language',Security::remove_XSS($_POST['language'])); $form->addElement('hidden', 'language',Security::remove_XSS($_POST['language']));
$form->add_html_editor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250')); $form->add_html_editor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250'));
$form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0'); $form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0');
$form->addElement('radio', 'type', '', get_lang('PageLink') ,'1'); $form->addElement('radio', 'type', '', get_lang('PageLink') ,'1');
$form->addElement('textarea', 'changes', get_lang('ExplainChanges'),array('width'=>'20')); $form->addElement('textarea', 'changes', get_lang('ExplainChanges'),array('width'=>'20'));
$preview = LegalManager::show_last_condition($term_preview);
$preview = LegalManager::show_last_condition($term_preview);
if ($term_preview['type']!=-1) { if ($term_preview['type']!=-1) {
$form->addElement('label', get_lang('Preview'), $preview); $form->addElement('label', get_lang('Preview'), $preview);
} }
// Submit & preview button // Submit & preview button
$navigator_info = api_get_navigator(); $navigator_info = api_get_navigator();
//ie6 fix //ie6 fix
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$buttons = '<div class="row" align="center"> $buttons = '<div class="row" align="center">
@ -120,7 +119,7 @@ if (isset($_POST['language'])) {
</div>'; </div>';
$form->addElement('html',$buttons); $form->addElement('html',$buttons);
} else { } else {
$buttons = '<div class="row" align="center"> $buttons = '<div class="row" align="center">
<div class="formw"> <div class="formw">
<button type="submit" class="back" name="send" value="back">'.get_lang('Back').'</button> <button type="submit" class="back" name="send" value="back">'.get_lang('Back').'</button>
<button type="submit" class="search" name="send" value="preview">'.get_lang('Preview').'</button> <button type="submit" class="search" name="send" value="preview">'.get_lang('Preview').'</button>
@ -131,12 +130,7 @@ if (isset($_POST['language'])) {
} }
} else { } else {
$form->addElement('select_language', 'language', get_lang('Language'),null,array()); $form->addElement('select_language', 'language', get_lang('Language'),null,array());
$buttons = '<div class="row"> $form->addElement('button', 'send', get_lang('Load'));
<div class="formw">
<button type="submit" class="save" name="send" value="load">'.get_lang('Load').'</button>
</div>
</div>';
$form->addElement('html',$buttons);
} }
@ -154,9 +148,7 @@ function sendlang(){
// action menu // action menu
echo '<div class="actions">'; echo '<div class="actions">';
echo '<div style="float:right;"> echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/legal_list.php">'.Display::return_icon('search.gif',get_lang('EditTermsAndConditions'),'').get_lang('AllVersions').'</a>';
<a href="'.api_get_path(WEB_CODE_PATH).'admin/legal_list.php">'.Display::return_icon('search.gif',get_lang('EditTermsAndConditions'),'').get_lang('AllVersions').'</a>&nbsp;&nbsp;
</div><br />';
echo '</div>'; echo '</div>';
if (isset ($_GET['action'])) { if (isset ($_GET['action'])) {
@ -168,4 +160,5 @@ if (isset ($_GET['action'])) {
} }
$form->setDefaults($defaults); $form->setDefaults($defaults);
$form->display(); $form->display();
Display :: display_footer();

15
main/admin/legal_list.php
Unescape View File

@ -10,15 +10,11 @@ $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAd
$tool_name = get_lang('TermsAndConditions'); $tool_name = get_lang('TermsAndConditions');
Display :: display_header($tool_name); Display :: display_header($tool_name);
require_once api_get_path(LIBRARY_PATH).'legal.lib.php';
$parameters['sec_token'] = Security::get_token(); $parameters['sec_token'] = Security::get_token();
// action menu // action menu
echo '<div class="actions">'; echo '<div class="actions">';
echo '<div style="float:right;"> echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/legal_add.php">'.Display::return_icon('edit.gif',get_lang('EditTermsAndConditions'),'').get_lang('EditTermsAndConditions').'</a>&nbsp;&nbsp;';
<a href="'.api_get_path(WEB_CODE_PATH).'admin/legal_add.php">'.Display::return_icon('edit.gif',get_lang('EditTermsAndConditions'),'').get_lang('EditTermsAndConditions').'</a>&nbsp;&nbsp;
</div><br />';
echo '</div>'; echo '</div>';
// Actions // Actions
@ -45,11 +41,4 @@ function get_legal_data_mask($id, $params=null, $row=null) {
function count_mask() { function count_mask() {
return LegalManager::count(); return LegalManager::count();
} }
Display :: display_footer();
/*
==============================================================================
FOOTER
==============================================================================
*/
Display :: display_footer();
?>

44
main/auth/inscription.php
Unescape View File

@ -44,13 +44,13 @@ if ($display_all_form) {
$form->applyFilter(array('lastname', 'firstname'), 'trim'); $form->applyFilter(array('lastname', 'firstname'), 'trim');
$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
// EMAIL // EMAIL
$form->addElement('text', 'email', get_lang('Email'), array('size' => 40)); $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'); $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'); $form->applyFilter('email','trim');
if (api_get_setting('registration', 'email') != 'true') { if (api_get_setting('registration', 'email') != 'true') {
@ -71,7 +71,7 @@ if ($display_all_form) {
if (api_get_setting('registration', 'officialcode') == 'true') if (api_get_setting('registration', 'officialcode') == 'true')
$form->addRule('official_code', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('official_code', get_lang('ThisFieldIsRequired'), 'required');
} }
// USERNAME // USERNAME
if (api_get_setting('login_is_email') != 'true') { if (api_get_setting('login_is_email') != 'true') {
$form->addElement('text', 'username', get_lang('UserName'), array('size' => USERNAME_MAX_LENGTH)); $form->addElement('text', 'username', get_lang('UserName'), array('size' => USERNAME_MAX_LENGTH));
@ -139,7 +139,7 @@ if ($display_all_form) {
$form->addRule('openarea', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('openarea', get_lang('ThisFieldIsRequired'), 'required');
} }
} }
// EXTRA FIELDS // EXTRA FIELDS
$extra_data = UserManager::get_extra_user_data(api_get_user_id(), true); $extra_data = UserManager::get_extra_user_data(api_get_user_id(), true);
UserManager::set_extra_fields_in_form($form, $extra_data, 'registration'); UserManager::set_extra_fields_in_form($form, $extra_data, 'registration');
} }
@ -200,11 +200,15 @@ if (!CustomPages::enabled()) {
} }
} }
$tool_name = get_lang('Registration',null,(!empty($_POST['language'])?$_POST['language']:$_user['language'])); $tool_name = get_lang('Registration', null, (!empty($_POST['language'])?$_POST['language']:$_user['language']));
if (api_get_setting('allow_terms_conditions') == 'true') {
$tool_name = get_lang('TermsAndConditions');
}
Display :: display_header($tool_name); Display :: display_header($tool_name);
echo Display::page_header($tool_name); echo Display::page_header($tool_name);
$home = api_get_path(SYS_PATH).'home/'; $home = api_get_path(SYS_PATH).'home/';
if ($_configuration['multiple_access_urls']) { if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id(); $access_url_id = api_get_current_access_url_id();
@ -248,7 +252,7 @@ if (api_get_setting('allow_terms_conditions') == 'true') {
$language = api_get_interface_language(); $language = api_get_interface_language();
$language = api_get_language_id($language); $language = api_get_language_id($language);
$term_preview = LegalManager::get_last_condition($language); $term_preview = LegalManager::get_last_condition($language);
if (!$term_preview) { if (!$term_preview) {
//we load from the platform //we load from the platform
$language = api_get_setting('platformLanguage'); $language = api_get_setting('platformLanguage');
@ -260,7 +264,7 @@ if (api_get_setting('allow_terms_conditions') == 'true') {
$term_preview = LegalManager::get_last_condition($language); $term_preview = LegalManager::get_last_condition($language);
} }
} }
// Version and language // Version and language
$form->addElement('hidden', 'legal_accept_type', $term_preview['version'].':'.$term_preview['language_id']); $form->addElement('hidden', 'legal_accept_type', $term_preview['version'].':'.$term_preview['language_id']);
$form->addElement('hidden', 'legal_info', $term_preview['legal_id'].':'.$term_preview['language_id']); $form->addElement('hidden', 'legal_info', $term_preview['legal_id'].':'.$term_preview['language_id']);
@ -268,13 +272,13 @@ if (api_get_setting('allow_terms_conditions') == 'true') {
if (isset($_SESSION['info_current_user'][1]) && isset($_SESSION['info_current_user'][2])) { if (isset($_SESSION['info_current_user'][1]) && isset($_SESSION['info_current_user'][2])) {
$form->addElement('hidden', 'login', $_SESSION['info_current_user'][1]); $form->addElement('hidden', 'login', $_SESSION['info_current_user'][1]);
$form->addElement('hidden', 'password', $_SESSION['info_current_user'][2]); $form->addElement('hidden', 'password', $_SESSION['info_current_user'][2]);
} }
if ($term_preview['type'] == 1) { if ($term_preview['type'] == 1) {
$form->addElement('checkbox', 'legal_accept', null, get_lang('IHaveReadAndAgree').'&nbsp;<a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>'); $form->addElement('checkbox', 'legal_accept', null, get_lang('IHaveReadAndAgree').'&nbsp;<a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>');
$form->addRule('legal_accept', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('legal_accept', get_lang('ThisFieldIsRequired'), 'required');
} else { } else {
if (!empty($term_preview['content'])) { if (!empty($term_preview['content'])) {
$preview = LegalManager::show_last_condition($term_preview); $preview = LegalManager::show_last_condition($term_preview);
$form->addElement('label', get_lang('TermsAndConditions'), $preview); $form->addElement('label', get_lang('TermsAndConditions'), $preview);
} }
} }
@ -297,9 +301,9 @@ if ($form->validate()) {
if (empty($values['official_code'])) { if (empty($values['official_code'])) {
$values['official_code'] = api_strtoupper($values['username']); $values['official_code'] = api_strtoupper($values['username']);
} }
if (api_get_setting('login_is_email') == 'true') { if (api_get_setting('login_is_email') == 'true') {
$values['username'] = $values['email']; $values['username'] = $values['email'];
} }
// creating a new user // creating a new user
@ -317,7 +321,7 @@ if ($form->validate()) {
} }
} }
} }
// Register extra fields // Register extra fields
$extras = array(); $extras = array();
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
@ -325,7 +329,7 @@ if ($form->validate()) {
$extras[substr($key,6)] = $value; $extras[substr($key,6)] = $value;
} }
} }
//update the extra fields //update the extra fields
$count_extra_field = count($extras); $count_extra_field = count($extras);
if ($count_extra_field > 0) { if ($count_extra_field > 0) {
@ -390,11 +394,11 @@ if ($form->validate()) {
$admin_list = Database::fetch_array($result_list); $admin_list = Database::fetch_array($result_list);
$emailto = $admin_list['email']; $emailto = $admin_list['email'];
// 2. send mail to the platform admin // 2. send mail to the platform admin
$emailsubject = get_lang('ApprovalForNewAccount',null,$values['language']).': '.$values['username']; $emailsubject = get_lang('ApprovalForNewAccount',null,$values['language']).': '.$values['username'];
$emailbody = get_lang('ApprovalForNewAccount',null,$values['language'])."\n"; $emailbody = get_lang('ApprovalForNewAccount',null,$values['language'])."\n";
$emailbody .= get_lang('UserName',null,$values['language']).': '.$values['username']."\n"; $emailbody .= get_lang('UserName',null,$values['language']).': '.$values['username']."\n";
if (api_is_western_name_order()) { if (api_is_western_name_order()) {
$emailbody .= get_lang('FirstName',null,$values['language']).': '.$values['firstname']."\n"; $emailbody .= get_lang('FirstName',null,$values['language']).': '.$values['firstname']."\n";
$emailbody .= get_lang('LastName',null,$values['language']).': '.$values['lastname']."\n"; $emailbody .= get_lang('LastName',null,$values['language']).': '.$values['lastname']."\n";
@ -412,7 +416,7 @@ if ($form->validate()) {
} }
// 3. exit the page // 3. exit the page
unset($user_id); unset($user_id);
if (!CustomPages::enabled()) { if (!CustomPages::enabled()) {
Display :: display_footer(); Display :: display_footer();
} }
@ -438,7 +442,7 @@ if ($form->validate()) {
/* EMAIL NOTIFICATION */ /* EMAIL NOTIFICATION */
//already added in UserManager::add_user(); //already added in UserManager::add_user();
/* /*
if (strpos($values['email'], '@') !== false) { if (strpos($values['email'], '@') !== false) {
// Let us predefine some variables. Be sure to change the from address! // Let us predefine some variables. Be sure to change the from address!
@ -474,7 +478,7 @@ if ($form->validate()) {
$display_text.= '<p>'.get_lang('MailHasBeenSent',null,$_user['language']).'.</p>'; $display_text.= '<p>'.get_lang('MailHasBeenSent',null,$_user['language']).'.</p>';
} }
$button_text = ''; $button_text = '';
if ($is_allowedCreateCourse) { if ($is_allowedCreateCourse) {
$display_text .= '<p>'. get_lang('NowGoCreateYourCourse',null,$_user['language']). ".</p>\n"; $display_text .= '<p>'. get_lang('NowGoCreateYourCourse',null,$_user['language']). ".</p>\n";
$action_url = '../create_course/add_course.php'; $action_url = '../create_course/add_course.php';
$button_text = api_get_setting('course_validation') == 'true' $button_text = api_get_setting('course_validation') == 'true'

Write Preview
Loading…
Cancel
Save