diff --git a/main/admin/access_url_edit.php b/main/admin/access_url_edit.php index de3c056f2f..0ad123c706 100755 --- a/main/admin/access_url_edit.php +++ b/main/admin/access_url_edit.php @@ -79,11 +79,20 @@ $form->addElement('text','url',get_lang('URL'),array('size'=>'30')); $form->addRule('url', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('url', '', 'maxlength',254); $form->addElement('textarea','description',get_lang('Description')); +<<<<<<< /www/chamilodev.beeznest.com/www/main/admin/access_url_edit.php + +if ($_GET['url_id'] != 1) { +$form->addElement('checkbox','active',get_lang('Active')); +} + +//$form->addRule('checkbox', get_lang('ThisFieldIsRequired'), 'required'); +======= //the first url with id = 1 will be always active if ($_GET['url_id'] != 1) { $form->addElement('checkbox','active',get_lang('Active')); } +>>>>>>> /tmp/access_url_edit.php~other.zY-an1 $defaults['url']='http://'; $form->setDefaults($defaults); @@ -121,4 +130,4 @@ if (isset ($_GET['action'])) { // Submit button $form->addElement('submit', 'submit', $submit_name); $form->display(); -?> \ No newline at end of file +?> diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index 512786cdf6..b371017a22 100755 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -101,7 +101,6 @@ if ($_configuration['multiple_access_urls']) { $homep = api_get_path(SYS_PATH).'home/'; //homep for Home Path } - $menuf = 'home_menu'; //menuf for Menu File $newsf = 'home_news'; //newsf for News File $topf = 'home_top'; //topf for Top File @@ -115,11 +114,11 @@ $homef = array($menuf, $newsf, $topf, $noticef, $menutabs); foreach ($homef as $my_file) { if ($_configuration['multiple_access_urls']) { if (!file_exists($homep_new.$my_file.'_'.$lang.$ext)) { - copy($homep.$my_file.$ext,$homep_new.$my_file.'_'.$lang.$ext); + copy($homep.$my_file.$ext, $homep_new.$my_file.'_'.$lang.$ext); } } else { if (!file_exists($homep.$my_file.'_'.$lang.$ext)) { - copy($homep.$my_file.$ext,$homep.$my_file.'_'.$lang.$ext); + copy($homep.$my_file.$ext, $homep.$my_file.'_'.$lang.$ext); } } } @@ -565,9 +564,7 @@ if (!empty($action)) { $Categories = Database::store_result(Database::query("SELECT name FROM $tbl_category WHERE parent_id IS NULL ORDER BY tree_pos")); } -// ------------------------- -// ---- Display section ---- -// ------------------------- +// Display section Display::display_header($tool_name); @@ -583,7 +580,7 @@ switch ($action) { } break; case 'edit_notice': - //------------ Display for edit_notice case -------------- + // Display for edit_notice case ?>
diff --git a/main/admin/configure_inscription.php b/main/admin/configure_inscription.php index 0460f46cf0..3f428edb60 100755 --- a/main/admin/configure_inscription.php +++ b/main/admin/configure_inscription.php @@ -1,36 +1,30 @@ '; echo $tool_name; echo ''; - if (!empty($term_preview['content'])) + if (!empty($term_preview['content'])) { echo $term_preview['content']; - else + } else { echo get_lang('ComingSoon'); + } Display :: display_footer(); exit; } } } -$action=Security::remove_XSS($_GET['action']); -$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin')); +$action = Security::remove_XSS($_GET['action']); +$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin')); $tool_name = get_lang('ConfigureInscription'); -if(!empty($action)){ - $interbreadcrumb[]=array('url' => 'configure_inscription.php',"name" => get_lang('ConfigureInscription')); - switch($action){ - case "edit_top": - $tool_name=get_lang("EditTopRegister"); +if (!empty($action)) { + $interbreadcrumb[] = array('url' => 'configure_inscription.php', 'name' => get_lang('ConfigureInscription')); + switch($action) { + case 'edit_top': + $tool_name = get_lang('EditTopRegister'); break; } } $lang = ''; //el for "Edit Language" -if(!empty($_SESSION['user_language_choice'])) { - $lang=$_SESSION['user_language_choice']; -} elseif(!empty($_SESSION['_user']['language'])) { - $lang=$_SESSION['_user']['language']; +if (!empty($_SESSION['user_language_choice'])) { + $lang = $_SESSION['user_language_choice']; +} elseif (!empty($_SESSION['_user']['language'])) { + $lang = $_SESSION['_user']['language']; } else { - $lang=get_setting('platformLanguage'); + $lang = get_setting('platformLanguage'); } // ----- Ensuring availability of main files in the corresponding language ----- -if ($_configuration['multiple_access_urls']==true) { +if ($_configuration['multiple_access_urls']) { $access_url_id = api_get_current_access_url_id(); - if ($access_url_id != -1){ + if ($access_url_id != -1) { $url_info = api_get_access_url($access_url_id); - // "http://" and the final "/" replaced - //$url = substr($url_info['url'],7,strlen($url_info['url'])-8); $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $url_info['url'])); $clean_url = replace_dangerous_char($url); - $clean_url = str_replace('/','-',$clean_url); + $clean_url = str_replace('/', '-', $clean_url); $clean_url .= '/'; - $homep = '../../home/'; //homep for Home Path - $homep_new = '../../home/'.$clean_url; //homep for Home Path added the url + $homep = api_get_path(SYS_PATH).'home/'; //homep for Home Path + $homep_new = api_get_path(SYS_PATH).'home/'.$clean_url; //homep for Home Path added the url $new_url_dir = api_get_path(SYS_PATH).'home/'.$clean_url; //we create the new dir for the new sites if (!is_dir($new_url_dir)){ @@ -93,73 +86,72 @@ if ($_configuration['multiple_access_urls']==true) { } } } else { - $homep_new =''; - $homep = '../../home/'; //homep for Home Path + $homep_new = ''; + $homep = api_get_path(SYS_PATH).'home/'; //homep for Home Path } - - $topf = 'register_top'; //topf for Top File $ext = '.html'; //ext for HTML Extension - when used frequently, variables are $homef = array($topf); // If language-specific file does not exist, create it by copying default file -foreach($homef as $my_file) { - if ($_configuration['multiple_access_urls']==true) { +foreach ($homef as $my_file) { + if ($_configuration['multiple_access_urls']) { if (!file_exists($homep_new.$my_file.'_'.$lang.$ext)) { - copy($homep.$my_file.$ext,$homep_new.$my_file.'_'.$lang.$ext); + copy($homep.$my_file.$ext, $homep_new.$my_file.'_'.$lang.$ext); } } else { if (!file_exists($homep.$my_file.'_'.$lang.$ext)) { - copy($homep.$my_file.$ext,$homep.$my_file.'_'.$lang.$ext); + copy($homep.$my_file.$ext, $homep.$my_file.'_'.$lang.$ext); } } } -if(!empty($action)) { - if($_POST['formSent']) { - switch($action) { +if (!empty($action)) { + if ($_POST['formSent']) { + switch ($action) { case 'edit_top': // Filter - $home_top=''; - if (api_get_setting('wcag_anysurfer_public_pages')=='true') { - $home_top=WCAG_Rendering::prepareXHTML(); + $home_top = ''; + if (api_get_setting('wcag_anysurfer_public_pages') == 'true') { + $home_top = WCAG_Rendering::prepareXHTML(); } else { - $home_top=trim(stripslashes($_POST['register_top'])); + $home_top = trim(stripslashes($_POST['register_top'])); } // Write if (file_exists($homep.$topf.'_'.$lang.$ext)) { - if(is_writable($homep.$topf.'_'.$lang.$ext)) { - $fp=fopen($homep.$topf.'_'.$lang.$ext,"w"); - fputs($fp,$home_top); + if (is_writable($homep.$topf.'_'.$lang.$ext)) { + $fp = fopen($homep.$topf.'_'.$lang.$ext, 'w'); + fputs($fp, $home_top); fclose($fp); } else { - $errorMsg=get_lang('HomePageFilesNotWritable'); + $errorMsg = get_lang('HomePageFilesNotWritable'); } } else { //File does not exist - $fp=fopen($homep.$topf.'_'.$lang.$ext,"w"); - fputs($fp,$home_top); + $fp = fopen($homep.$topf.'_'.$lang.$ext, 'w'); + fputs($fp, $home_top); fclose($fp); } break; } - if(empty($errorMsg)) { + if (empty($errorMsg)) { header('Location: '.api_get_self()); exit(); } } else { - switch($action) { + switch ($action) { case 'edit_top': // This request is only the preparation for the update of the home_top $home_top = ''; - if(is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) { - $home_top=file_get_contents($homep.$topf.'_'.$lang.$ext); - } elseif(is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) { - $home_top=file_get_contents($homep.$topf.$lang.$ext); + if (is_file($homep.$topf.'_'.$lang.$ext) && is_readable($homep.$topf.'_'.$lang.$ext)) { + $home_top = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext); + } elseif (is_file($homep.$topf.$lang.$ext) && is_readable($homep.$topf.$lang.$ext)) { + $home_top = @(string)file_get_contents($homep.$topf.$lang.$ext); } else { - $errorMsg=get_lang('HomePageFilesNotReadable'); + $errorMsg = get_lang('HomePageFilesNotReadable'); } + $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top))); break; } } @@ -176,7 +168,7 @@ if (get_setting('allow_registration') == 'false') { api_not_allowed(); } //api_display_tool_title($tool_name); -if (get_setting('allow_registration')=='approval') { +if (get_setting('allow_registration') == 'approval') { Display::display_normal_message(get_lang('YourAccountHasToBeApproved')); } //if openid was not found @@ -185,231 +177,232 @@ if (!empty($_GET['openid_msg']) && $_GET['openid_msg'] == 'idnotfound') { } $form = new FormValidator('registration'); -if (get_setting('allow_terms_conditions')=='true') { - if (!isset($_SESSION['update_term_and_condition'][1])) { - $display_all_form=true; - } else { - $display_all_form=false; - } +if (get_setting('allow_terms_conditions') == 'true') { + $display_all_form = !isset($_SESSION['update_term_and_condition'][1]); } else { - $display_all_form=true; -} -if ($display_all_form===true) { - -// LAST NAME and FIRST NAME -$form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled')); -$form->applyFilter('lastname','trim'); -$form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40, 'disabled' => 'disabled')); -$form->applyFilter('firstname','trim'); -$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required'); -$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required'); -// EMAIL -$form->addElement('text', 'email', get_lang('Email'), array('size' => 40, 'disabled' => 'disabled')); -if (api_get_setting('registration', 'email') == 'true') - $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required'); -$form->addRule('email', get_lang('EmailWrong'), 'email'); -if (api_get_setting('openid_authentication')=='true') { - $form->addElement('text', 'openid', get_lang('OpenIDURL'), array('size' => 40, 'disabled' => 'disabled')); + $display_all_form = true; } -// USERNAME -$form->addElement('text', 'username', get_lang('UserName'), array('size' => 20, 'disabled' => 'disabled')); -$form->addRule('username', get_lang('ThisFieldIsRequired'), 'required'); -$form->addRule('username', get_lang('UsernameWrong'), 'username'); -$form->addRule('username', get_lang('UserTaken'), 'username_available'); -$form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'),'20'), 'maxlength',20); -// PASSWORD -$form->addElement('password', 'pass1', get_lang('Pass'), array('size' => 40, 'disabled' => 'disabled')); -$form->addElement('password', 'pass2', get_lang('Confirmation'), array('size' => 40, 'disabled' => 'disabled')); -$form->addRule('pass1', get_lang('ThisFieldIsRequired'), 'required'); -$form->addRule('pass2', get_lang('ThisFieldIsRequired'), 'required'); -$form->addRule(array('pass1', 'pass2'), get_lang('PassTwo'), 'compare'); -if (CHECK_PASS_EASY_TO_FIND) - $form->addRule('password1', get_lang('PassTooEasy').': '.api_generate_password(), 'callback', 'api_check_password'); - -// PHONE -$form->addElement('text', 'phone', get_lang('Phone'), array('size' => 40, 'disabled' => 'disabled')); -if (api_get_setting('registration', 'phone') == 'true') - $form->addRule('phone', get_lang('ThisFieldIsRequired'), 'required'); - -// LANGUAGE -if (get_setting('registration', 'language') == 'true') { - $form->addElement('select_language', 'language', get_lang('Language'), '', array('disabled' => 'disabled')); -} -// STUDENT/TEACHER -if (get_setting('allow_registration_as_teacher') <> 'false') { - $form->addElement('radio', 'status', get_lang('Status'), get_lang('RegStudent'), STUDENT, array('disabled' => 'disabled')); - $form->addElement('radio', 'status', null, get_lang('RegAdmin'), COURSEMANAGER, array('disabled' => 'disabled')); -} +if ($display_all_form) { -// EXTENDED FIELDS -if (api_get_setting('extended_profile') == 'true' AND api_get_setting('extendedprofile_registration','mycomptetences') == 'true') -{ - $form->add_html_editor('competences', get_lang('MyCompetences'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); -} -if (api_get_setting('extended_profile') == 'true' AND api_get_setting('extendedprofile_registration','mydiplomas') == 'true') -{ - $form->add_html_editor('diplomas', get_lang('MyDiplomas'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); -} -if (api_get_setting('extended_profile') == 'true' AND api_get_setting('extendedprofile_registration','myteach') == 'true') -{ - $form->add_html_editor('teach', get_lang('MyTeach'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); -} -if (api_get_setting('extended_profile') == 'true' AND api_get_setting('extendedprofile_registration','mypersonalopenarea') == 'true') -{ - $form->add_html_editor('openarea', get_lang('MyPersonalOpenArea'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); -} -if (api_get_setting('extended_profile') == 'true') -{ - if (api_get_setting('extendedprofile_registrationrequired','mycomptetences') == 'true') - { - $form->addRule('competences', get_lang('ThisFieldIsRequired'), 'required'); + if (api_is_western_name_order()) { + // FIRST NAME and LAST NAME + $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled')); + $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40, 'disabled' => 'disabled')); + } else { + // LAST NAME and FIRST NAME + $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40, 'disabled' => 'disabled')); + $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40, 'disabled' => 'disabled')); } - if (api_get_setting('extendedprofile_registrationrequired','mydiplomas') == 'true') - { - $form->addRule('diplomas', get_lang('ThisFieldIsRequired'), 'required'); + $form->applyFilter('firstname', 'trim'); + $form->applyFilter('lastname', 'trim'); + $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required'); + + // EMAIL + $form->addElement('text', 'email', get_lang('Email'), array('size' => 40, 'disabled' => 'disabled')); + if (api_get_setting('registration', 'email') == 'true') { + $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required'); } - if (api_get_setting('extendedprofile_registrationrequired','myteach') == 'true') - { - $form->addRule('teach', get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('email', get_lang('EmailWrong'), 'email'); + if (api_get_setting('openid_authentication') == 'true') { + $form->addElement('text', 'openid', get_lang('OpenIDURL'), array('size' => 40, 'disabled' => 'disabled')); } - if (api_get_setting('extendedprofile_registrationrequired','mypersonalopenarea') == 'true') - { - $form->addRule('openarea', get_lang('ThisFieldIsRequired'), 'required'); + + // USERNAME + $form->addElement('text', 'username', get_lang('UserName'), array('size' => USERNAME_MAX_LENGTH, 'disabled' => 'disabled')); + $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('username', get_lang('UsernameWrong'), 'username'); + $form->addRule('username', get_lang('UserTaken'), 'username_available'); + $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH); + + // PASSWORD + $form->addElement('password', 'pass1', get_lang('Pass'), array('size' => 40, 'disabled' => 'disabled')); + $form->addElement('password', 'pass2', get_lang('Confirmation'), array('size' => 40, 'disabled' => 'disabled')); + $form->addRule('pass1', get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule('pass2', get_lang('ThisFieldIsRequired'), 'required'); + $form->addRule(array('pass1', 'pass2'), get_lang('PassTwo'), 'compare'); + if (CHECK_PASS_EASY_TO_FIND) { + $form->addRule('password1', get_lang('PassTooEasy').': '.api_generate_password(), 'callback', 'api_check_password'); } -} -// EXTRA FIELDS -$extra = UserManager::get_extra_fields(0,50,5,'ASC'); -$extra_data = UserManager::get_extra_user_data(api_get_user_id(),true); -foreach ($extra as $id => $field_details) { - if ($field_details[6] == 0) { - continue; + + // PHONE + $form->addElement('text', 'phone', get_lang('Phone'), array('size' => 40, 'disabled' => 'disabled')); + if (api_get_setting('registration', 'phone') == 'true') { + $form->addRule('phone', get_lang('ThisFieldIsRequired'), 'required'); + } + + // LANGUAGE + if (get_setting('registration', 'language') == 'true') { + $form->addElement('select_language', 'language', get_lang('Language'), '', array('disabled' => 'disabled')); + } + + // STUDENT/TEACHER + if (get_setting('allow_registration_as_teacher') != 'false') { + $form->addElement('radio', 'status', get_lang('Status'), get_lang('RegStudent'), STUDENT, array('disabled' => 'disabled')); + $form->addElement('radio', 'status', null, get_lang('RegAdmin'), COURSEMANAGER, array('disabled' => 'disabled')); } - switch($field_details[2]) { - case USER_FIELD_TYPE_TEXT: - $form->addElement('text', 'extra_'.$field_details[1], $field_details[3], array('size' => 40)); - $form->applyFilter('extra_'.$field_details[1], 'stripslashes'); - $form->applyFilter('extra_'.$field_details[1], 'trim'); - if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); - break; - case USER_FIELD_TYPE_TEXTAREA: - $form->add_html_editor('extra_'.$field_details[1], $field_details[3], false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); - //$form->addElement('textarea', 'extra_'.$field_details[1], $field_details[3], array('size' => 80)); - $form->applyFilter('extra_'.$field_details[1], 'stripslashes'); - $form->applyFilter('extra_'.$field_details[1], 'trim'); - if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); - break; - case USER_FIELD_TYPE_RADIO: - $group = array(); - foreach ($field_details[9] as $option_id => $option_details) { - $options[$option_details[1]] = $option_details[2]; - $group[] =& HTML_QuickForm::createElement('radio', 'extra_'.$field_details[1], $option_details[1],$option_details[2].'
',$option_details[1]); - } - $form->addGroup($group, 'extra_'.$field_details[1], $field_details[3], ''); - if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); - break; - case USER_FIELD_TYPE_SELECT: - $options = array(); - foreach($field_details[9] as $option_id => $option_details) { - $options[$option_details[1]] = $option_details[2]; - } - $form->addElement('select','extra_'.$field_details[1],$field_details[3],$options,''); - if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); - break; - case USER_FIELD_TYPE_SELECT_MULTIPLE: - $options = array(); - foreach ($field_details[9] as $option_id => $option_details) { - $options[$option_details[1]] = $option_details[2]; - } - $form->addElement('select','extra_'.$field_details[1],$field_details[3],$options,array('multiple' => 'multiple')); - if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); - break; - case USER_FIELD_TYPE_DATE: - $form->addElement('datepickerdate', 'extra_'.$field_details[1], $field_details[3],array('form_name'=>'registration')); - $form->_elements[$form->_elementIndex['extra_'.$field_details[1]]]->setLocalOption('minYear',1900); - $defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00'); - $form -> setDefaults($defaults); - if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); - $form->applyFilter('theme', 'trim'); - break; - case USER_FIELD_TYPE_DATETIME: - $form->addElement('datepicker', 'extra_'.$field_details[1], $field_details[3],array('form_name'=>'registration')); - $form->_elements[$form->_elementIndex['extra_'.$field_details[1]]]->setLocalOption('minYear',1900); - $defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00'); - $form -> setDefaults($defaults); - if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); - $form->applyFilter('theme', 'trim'); - break; - case USER_FIELD_TYPE_DOUBLE_SELECT: - foreach ($field_details[9] as $key=>$element) { - if ($element[2][0] == '*') { - $values['*'][$element[0]] = str_replace('*','',$element[2]); - } else { - $values[0][$element[0]] = $element[2]; - } - } - $group=''; - $group[] =& HTML_QuickForm::createElement('select', 'extra_'.$field_details[1],'',$values[0],''); - $group[] =& HTML_QuickForm::createElement('select', 'extra_'.$field_details[1].'*','',$values['*'],''); - $form->addGroup($group, 'extra_'.$field_details[1], $field_details[3], ' '); - if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); - - // recoding the selected values for double : if the user has selected certain values, we have to assign them to the correct select form - if (key_exists('extra_'.$field_details[1], $extra_data)) { - // exploding all the selected values (of both select forms) - $selected_values = explode(';',$extra_data['extra_'.$field_details[1]]); - $extra_data['extra_'.$field_details[1]] =array(); - - // looping through the selected values and assigning the selected values to either the first or second select form - foreach ($selected_values as $key=>$selected_value) { - if (key_exists($selected_value,$values[0])) { - $extra_data['extra_'.$field_details[1]]['extra_'.$field_details[1]] = $selected_value; + // EXTENDED FIELDS + if (api_get_setting('extended_profile') == 'true' && api_get_setting('extendedprofile_registration','mycomptetences') == 'true') { + $form->add_html_editor('competences', get_lang('MyCompetences'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); + } + if (api_get_setting('extended_profile') == 'true' && api_get_setting('extendedprofile_registration','mydiplomas') == 'true') { + $form->add_html_editor('diplomas', get_lang('MyDiplomas'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); + } + if (api_get_setting('extended_profile') == 'true' && api_get_setting('extendedprofile_registration','myteach') == 'true') { + $form->add_html_editor('teach', get_lang('MyTeach'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); + } + if (api_get_setting('extended_profile') == 'true' && api_get_setting('extendedprofile_registration','mypersonalopenarea') == 'true') { + $form->add_html_editor('openarea', get_lang('MyPersonalOpenArea'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); + } + if (api_get_setting('extended_profile') == 'true') { + if (api_get_setting('extendedprofile_registrationrequired', 'mycomptetences') == 'true') { + $form->addRule('competences', get_lang('ThisFieldIsRequired'), 'required'); + } + if (api_get_setting('extendedprofile_registrationrequired', 'mydiplomas') == 'true') { + $form->addRule('diplomas', get_lang('ThisFieldIsRequired'), 'required'); + } + if (api_get_setting('extendedprofile_registrationrequired', 'myteach') == 'true') { + $form->addRule('teach', get_lang('ThisFieldIsRequired'), 'required'); + } + if (api_get_setting('extendedprofile_registrationrequired', 'mypersonalopenarea') == 'true') { + $form->addRule('openarea', get_lang('ThisFieldIsRequired'), 'required'); + } + } + + // EXTRA FIELDS + $extra = UserManager::get_extra_fields(0, 50, 5, 'ASC'); + $extra_data = UserManager::get_extra_user_data(api_get_user_id(), true); + foreach ($extra as $id => $field_details) { + if ($field_details[6] == 0) { + continue; + } + switch($field_details[2]) { + case USER_FIELD_TYPE_TEXT: + $form->addElement('text', 'extra_'.$field_details[1], $field_details[3], array('size' => 40)); + $form->applyFilter('extra_'.$field_details[1], 'stripslashes'); + $form->applyFilter('extra_'.$field_details[1], 'trim'); + if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); + break; + case USER_FIELD_TYPE_TEXTAREA: + $form->add_html_editor('extra_'.$field_details[1], $field_details[3], false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130')); + //$form->addElement('textarea', 'extra_'.$field_details[1], $field_details[3], array('size' => 80)); + $form->applyFilter('extra_'.$field_details[1], 'stripslashes'); + $form->applyFilter('extra_'.$field_details[1], 'trim'); + if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); + break; + case USER_FIELD_TYPE_RADIO: + $group = array(); + foreach ($field_details[9] as $option_id => $option_details) { + $options[$option_details[1]] = $option_details[2]; + $group[] =& HTML_QuickForm::createElement('radio', 'extra_'.$field_details[1], $option_details[1],$option_details[2].'
',$option_details[1]); + } + $form->addGroup($group, 'extra_'.$field_details[1], $field_details[3], ''); + if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); + break; + case USER_FIELD_TYPE_SELECT: + $options = array(); + foreach($field_details[9] as $option_id => $option_details) { + $options[$option_details[1]] = $option_details[2]; + } + $form->addElement('select','extra_'.$field_details[1], $field_details[3], $options, ''); + if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); + break; + case USER_FIELD_TYPE_SELECT_MULTIPLE: + $options = array(); + foreach ($field_details[9] as $option_id => $option_details) { + $options[$option_details[1]] = $option_details[2]; + } + $form->addElement('select','extra_'.$field_details[1], $field_details[3], $options, array('multiple' => 'multiple')); + if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); + break; + case USER_FIELD_TYPE_DATE: + $form->addElement('datepickerdate', 'extra_'.$field_details[1], $field_details[3], array('form_name' => 'registration')); + $form->_elements[$form->_elementIndex['extra_'.$field_details[1]]]->setLocalOption('minYear', 1900); + $defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00'); + $form -> setDefaults($defaults); + if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); + $form->applyFilter('theme', 'trim'); + break; + case USER_FIELD_TYPE_DATETIME: + $form->addElement('datepicker', 'extra_'.$field_details[1], $field_details[3], array('form_name' => 'registration')); + $form->_elements[$form->_elementIndex['extra_'.$field_details[1]]]->setLocalOption('minYear', 1900); + $defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00'); + $form -> setDefaults($defaults); + if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); + $form->applyFilter('theme', 'trim'); + break; + case USER_FIELD_TYPE_DOUBLE_SELECT: + foreach ($field_details[9] as $key => $element) { + if ($element[2][0] == '*') { + $values['*'][$element[0]] = str_replace('*', '', $element[2]); } else { - $extra_data['extra_'.$field_details[1]]['extra_'.$field_details[1].'*'] = $selected_value; + $values[0][$element[0]] = $element[2]; } } - } - break; - case USER_FIELD_TYPE_DIVIDER: - $form->addElement('static',$field_details[1], '
'.$field_details[3].''); - break; + + $group = ''; + $group[] =& HTML_QuickForm::createElement('select', 'extra_'.$field_details[1], '', $values[0], ''); + $group[] =& HTML_QuickForm::createElement('select', 'extra_'.$field_details[1].'*', '', $values['*'], ''); + $form->addGroup($group, 'extra_'.$field_details[1], $field_details[3], ' '); + if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); + + // recoding the selected values for double : if the user has selected certain values, we have to assign them to the correct select form + if (key_exists('extra_'.$field_details[1], $extra_data)) { + // exploding all the selected values (of both select forms) + $selected_values = explode(';', $extra_data['extra_'.$field_details[1]]); + $extra_data['extra_'.$field_details[1]] = array(); + + // looping through the selected values and assigning the selected values to either the first or second select form + foreach ($selected_values as $key => $selected_value) { + if (key_exists($selected_value,$values[0])) { + $extra_data['extra_'.$field_details[1]]['extra_'.$field_details[1]] = $selected_value; + } else { + $extra_data['extra_'.$field_details[1]]['extra_'.$field_details[1].'*'] = $selected_value; + } + } + } + break; + case USER_FIELD_TYPE_DIVIDER: + $form->addElement('static', $field_details[1], '
'.$field_details[3].''); + break; + } } -} } -//------------ Terms and conditions -if (get_setting('allow_terms_conditions')=='true') { - //$language = api_get_setting('platformLanguage'); + +// Terms and conditions +if (get_setting('allow_terms_conditions') == 'true') { $language = api_get_interface_language(); $language = api_get_language_id($language); - $term_preview= LegalManager::get_last_condition($language); + $term_preview = LegalManager::get_last_condition($language); - if ($term_preview==false) { + if (!$term_preview) { //we load from the platform $language = api_get_setting('platformLanguage'); $language = api_get_language_id($language); - $term_preview= LegalManager::get_last_condition($language); + $term_preview = LegalManager::get_last_condition($language); //if is false we load from english - if ($term_preview==false){ + if (!$term_preview) { $language = api_get_language_id('english'); //this must work - $term_preview= LegalManager::get_last_condition($language); + $term_preview = LegalManager::get_last_condition($language); } } // Version and language //password - $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_accept_type', $term_preview['version'].':'.$term_preview['language_id']); + $form->addElement('hidden', 'legal_info', $term_preview['legal_id'].':'.$term_preview['language_id']); 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]); + $form->addElement('hidden', 'login', $_SESSION['info_current_user'][1]); + $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').' '.get_lang('TermsAndConditions').''); $form->addRule('extra_legal_accept', get_lang('ThisFieldIsRequired'), 'required'); } else { if (!empty($term_preview['content'])) { $preview = LegalManager::show_last_condition($term_preview); - $term_preview = '
+ $term_preview = '
'.get_lang('TermsAndConditions').'
'.$preview.' @@ -421,58 +414,58 @@ if (get_setting('allow_terms_conditions')=='true') { } } -$form->addElement('style_submit_button', 'submit', get_lang('RegisterUser'),array('class' => 'save', 'disabled' => 'disabled')); +$form->addElement('style_submit_button', 'submit', get_lang('RegisterUser'), array('class' => 'save', 'disabled' => 'disabled')); + $defaults['status'] = STUDENT; -$form->setDefaults($defaults); -if(isset($_SESSION["user_language_choice"]) && $_SESSION["user_language_choice"]!=""){ - $defaults['language'] = $_SESSION["user_language_choice"]; -} -else{ + +if (isset($_SESSION['user_language_choice']) && $_SESSION['user_language_choice'] != '') { + $defaults['language'] = $_SESSION['user_language_choice']; +} else { $defaults['language'] = api_get_setting('platformLanguage'); } -if(!empty($_GET['username'])) -{ + +if (!empty($_GET['username'])) { $defaults['username'] = Security::remove_XSS($_GET['username']); } -if(!empty($_GET['email'])) -{ + +if (!empty($_GET['email'])) { $defaults['email'] = Security::remove_XSS($_GET['email']); } -if(!empty($_GET['phone'])) -{ +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']); } -switch($action){ +$form->setDefaults($defaults); + +switch ($action){ case 'edit_top': - if($action == 'edit_top') { - $name= $topf; + if ($action == 'edit_top') { + $name = $topf; $open = $home_top; } else { $name = $newsf; - $open=@file_get_contents($homep.$newsf.'_'.$lang.$ext); - + $open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext); + $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open))); } - if(!empty($errorMsg)) { - Display::display_normal_message($errorMsg); //main API + if (!empty($errorMsg)) { + Display::display_normal_message($errorMsg); } $default = array(); - $form = new FormValidator('configure_homepage_'.$action, 'post', api_get_self().'?action='.$action, '', array('style' => 'margin: 0px;')); + $form = new FormValidator('configure_inscription_'.$action, 'post', api_get_self().'?action='.$action, '', array('style' => 'margin: 0px;')); $renderer =& $form->defaultRenderer(); $renderer->setHeaderTemplate(''); $renderer->setFormTemplate('{content}
'); $renderer->setElementTemplate('{element}'); $renderer->setRequiredNoteTemplate(''); $form->addElement('hidden', 'formSent', '1'); - if (api_get_setting('wcag_anysurfer_public_pages')=='true') { + if (api_get_setting('wcag_anysurfer_public_pages') == 'true') { //TODO: review these lines // Print WCAG-specific HTML editor $html = ''; @@ -488,30 +481,22 @@ switch($action){ $form->display(); break; default: - /*******************************/ //Form of language api_display_language_form(); - echo '  '.Display::display_icon('edit.gif', get_lang('Edit')).' '.get_lang('EditNotice').''; - echo '
'; - $home_notice = ''; - if(file_exists($homep.$topf.'_'.$lang.$ext)) { - $home_notice = @file_get_contents($homep.$topf.'_'.$lang.$ext); + //echo '
'; + echo '
'; + $open = ''; + if (file_exists($homep.$topf.'_'.$lang.$ext)) { + $open = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext); } else { - $home_notice = @file_get_contents($homep.$topf.$ext); + $open = @(string)file_get_contents($homep.$topf.$ext); } - echo $home_notice; + $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open))); + echo $open; echo '
'; - /*******************************/ $form->display(); break; } -/* -============================================================================== - FOOTER -============================================================================== -*/ - Display :: display_footer(); -?> \ No newline at end of file diff --git a/main/admin/dashboard_add_users_to_user.php b/main/admin/dashboard_add_users_to_user.php index 5b3e5e9fee..709dc13aad 100755 --- a/main/admin/dashboard_add_users_to_user.php +++ b/main/admin/dashboard_add_users_to_user.php @@ -72,7 +72,7 @@ function search_users($needle,$type) { } $sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user - WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND user_id NOT IN ($user_anonymous, $current_user_id, $hrm_id) $without_assigned_users"; + WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND status<>".DRH." AND user_id NOT IN ($user_anonymous, $current_user_id, $hrm_id) $without_assigned_users"; $rs = Database::query($sql); $return .= '