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

Fixing portal legal agreement UI

Browse Source
skala
Julio Montoya 13 years ago
parent b358024b89
commit 85f36ab53a
2 changed files with 32 additions and 79 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. 59
      main/admin/legal_add.php
  2. 52
      main/auth/inscription.php

59
main/admin/legal_add.php
Unescape View File

@ -8,8 +8,6 @@ $this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'legal.lib.php';
// Create the form
$form = new FormValidator('addlegal');
@ -78,22 +76,8 @@ if( $form->validate()) {
}
}
}
} else {
/*
if (!isset($_POST['language'])) {
$language = api_get_setting('platformLanguage');
$language = api_get_language_id($language);
$term_preview = LegalManager::get_last_condition($language);
$defaults['type']=$term_preview['type'];
if (!$term_preview) {
// there are not terms and conditions
$term_preview['type']=-1;
$defaults['type']=0;
}
$defaults['content']=$term_preview['content'];
$defaults['changes']=$term_preview['changes'];
}*/
}
$form->setDefaults($default);
if(isset($_POST['send'])) {
@ -103,43 +87,29 @@ $token = Security::get_token();
$form->addElement('hidden','sec_token');
$form->setConstants(array('sec_token' => $token));
$text = '<div class="row">
<div class="label"></div>
<div class="formw">
'.get_lang('DisplayTermsConditions').'
</div>
</div>';
$form->addElement('html',$text);
//$form->addElement('select_language', 'language', get_lang('Language'),null,array('id'=>'language','onchange'=>'sendlang();'));
$form->addElement('label', null, get_lang('DisplayTermsConditions'));
if (isset($_POST['language'])) {
//$form->addElement('html_editor', 'content', null, null, array('ToolbarSet' => 'Basic', 'Width' => '100%', 'Height' => '250'));
$form->addElement('static', 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->addElement('textarea', 'content', get_lang('Content'),array('cols'=>'120','rows'=>'10'));
$form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0');
$form->addElement('radio', 'type', '', get_lang('PageLink') ,'1');
$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) {
$term_preview = '<div class="row">
<div class="label">'.get_lang('Preview').'</div>
<div class="formw">
'.$preview.'
</div>
</div>';
$form->addElement('html',$term_preview);
$form->addElement('label', get_lang('Preview'), $preview);
}
// Submit & preview button
$navigator_info = api_get_navigator();
//ie6 fix
$navigator_info = api_get_navigator();
//ie6 fix
if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') {
$buttons = '<div class="row" align="center">
<div class="formw">
@ -163,7 +133,7 @@ if (isset($_POST['language'])) {
$form->addElement('select_language', 'language', get_lang('Language'),null,array());
$buttons = '<div class="row">
<div class="formw">
<button type="submit" class="save" name="send" value="load">'.get_lang('Load').'</button>
<button type="submit" class="save" name="send" value="load">'.get_lang('Load').'</button>
</div>
</div>';
$form->addElement('html',$buttons);
@ -198,5 +168,4 @@ if (isset ($_GET['action'])) {
}
$form->setDefaults($defaults);
$form->display();
?>
$form->display();

52
main/auth/inscription.php
Unescape View File

@ -13,8 +13,6 @@ if (!empty($_POST['language'])) { //quick hack to adapt the registration form re
require_once '../inc/global.inc.php';
require_once api_get_path(CONFIGURATION_PATH).'profile.conf.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'legal.lib.php';
//require_once api_get_path(LIBRARY_PATH).'custompages.lib.php';moved to autoload
if (!empty($_SESSION['user_language_choice'])) {
$user_selected_language = $_SESSION['user_language_choice'];
@ -248,8 +246,6 @@ if ($display_all_form) {
}
}
$form->addElement('style_submit_button', 'submit', get_lang('RegisterUser'), 'class="btn"');
if (isset($_SESSION['user_language_choice']) && $_SESSION['user_language_choice'] != '') {
$defaults['language'] = $_SESSION['user_language_choice'];
} else {
@ -324,7 +320,6 @@ if (!CustomPages::enabled()) {
}
}
if (file_exists($home.'register_top_'.$user_selected_language.'.html')) {
$home_top_temp = @(string)file_get_contents($home.'register_top_'.$user_selected_language.'.html');
$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
@ -349,13 +344,12 @@ if (!CustomPages::enabled()) {
}
}
// Terms and conditions
if (api_get_setting('allow_terms_conditions') == 'true') {
$language = api_get_interface_language();
$language = api_get_language_id($language);
$term_preview = LegalManager::get_last_condition($language);
if (!$term_preview) {
//we load from the platform
$language = api_get_setting('platformLanguage');
@ -367,6 +361,7 @@ if (api_get_setting('allow_terms_conditions') == 'true') {
$term_preview = LegalManager::get_last_condition($language);
}
}
// Version and language
$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']);
@ -374,25 +369,19 @@ if (api_get_setting('allow_terms_conditions') == 'true') {
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', 'password', $_SESSION['info_current_user'][2]);
}
}
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->addRule('legal_accept', get_lang('ThisFieldIsRequired'), 'required');
} else {
if (!empty($term_preview['content'])) {
$preview = LegalManager::show_last_condition($term_preview);
$term_preview = '<div class="row">
<div class="label">'.get_lang('TermsAndConditions').'</div>
<div class="formw">
'.$preview.'
<br />
</div>
</div>';
$form->addElement('html', $term_preview);
$preview = LegalManager::show_last_condition($term_preview);
$form->addElement('label', get_lang('TermsAndConditions'), $preview);
}
}
}
$form->addElement('button', 'submit', get_lang('RegisterUser'));
if ($form->validate()) {
/*
@ -413,7 +402,6 @@ if ($form->validate()) {
$values['username'] = $values['email'];
}
// creating a new user
$user_id = UserManager::create_user($values['firstname'], $values['lastname'], $values['status'], $values['email'], $values['username'], $values['pass1'], $values['official_code'], $values['language'], $values['phone'], $picture_uri);
@ -508,6 +496,7 @@ if ($form->validate()) {
$emailsubject = get_lang('ApprovalForNewAccount',null,$values['language']).': '.$values['username'];
$emailbody = get_lang('ApprovalForNewAccount',null,$values['language'])."\n";
$emailbody .= get_lang('UserName',null,$values['language']).': '.$values['username']."\n";
if (api_is_western_name_order()) {
$emailbody .= get_lang('FirstName',null,$values['language']).': '.$values['firstname']."\n";
$emailbody .= get_lang('LastName',null,$values['language']).': '.$values['lastname']."\n";
@ -532,9 +521,7 @@ if ($form->validate()) {
exit;
}
/*
SESSION REGISTERING
*/
/* SESSION REGISTERING */
$_user['firstName'] = stripslashes($values['firstname']);
$_user['lastName'] = stripslashes($values['lastname']);
$_user['mail'] = $values['email'];
@ -551,9 +538,7 @@ if ($form->validate()) {
Session::write('user_last_login_datetime',$user_last_login_datetime);
/*
EMAIL NOTIFICATION
*/
/* EMAIL NOTIFICATION */
if (strpos($values['email'], '@') !== false) {
// Let us predefine some variables. Be sure to change the from address!
@ -589,8 +574,7 @@ if ($form->validate()) {
$display_text.= '<p>'.get_lang('MailHasBeenSent',null,$_user['language']).'.</p>';
}
$button_text = '';
if ($is_allowedCreateCourse) {
if ($is_allowedCreateCourse) {
$display_text .= '<p>'. get_lang('NowGoCreateYourCourse',null,$_user['language']). ".</p>\n";
$action_url = '../create_course/add_course.php';
$button_text = api_get_setting('course_validation') == 'true'
@ -608,16 +592,16 @@ if ($form->validate()) {
// ?uidReset=true&uidReq=$_user['user_id']
$display_text .= '<form action="'. $action_url. '" method="post">'. "\n". '<button type="submit" class="next" name="next" value="'. get_lang('Next',null,$_user['language']). '" validationmsg=" '. get_lang('Next',null,$_user['language']). ' ">'. $button_text. '</button>'. "\n". '</form><br />'. "\n";
if (CustomPages::enabled()) {
CustomPages::display(CustomPages::REGISTRATION_FEEDBACK, array('info' => $display_text));
}
if (CustomPages::enabled()) {
CustomPages::display(CustomPages::REGISTRATION_FEEDBACK, array('info' => $display_text));
}
echo $display_text;
} else {
// Custom pages
if (CustomPages::enabled()) {
CustomPages::display(CustomPages::REGISTRATION, array('form' => $form));
} else {
$form->display();
}
if (CustomPages::enabled()) {
CustomPages::display(CustomPages::REGISTRATION, array('form' => $form));
} else {
$form->display();
}
}
Display :: display_footer();
Write Preview
Loading…
Cancel
Save