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

[svn r22024] FS#2867 - Admin tools, autentication: Elimination of the global variable $fck_attribute.

Browse Source
skala
Ivan Tcholakov 17 years ago
parent 6f027147cc
commit f2e68d1e0d
6 changed files with 17 additions and 32 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. 5
      main/admin/calendar.php
  2. 4
      main/admin/user_add.php
  3. 4
      main/admin/user_edit.php
  4. 16
      main/auth/inscription.php
  5. 16
      main/auth/profile.php
  6. 4
      main/inc/lib/fckeditor/toolbars/profil.php

5
main/admin/calendar.php
Unescape View File

@ -253,11 +253,6 @@ if (empty($_GET['origin']) or $_GET['origin']!='learnpath')
echo '<td width="20" background="../img/verticalruler.gif">&nbsp;</td>';
}
//TODO: check for delete this code
//$fck_attribute['Width'] = '600';
//$fck_attribute['Height'] = '400';
//$fck_attribute['ToolbarSet'] = 'Middle';
// THE RIGHT PART
echo '<td valign="top">';

4
main/admin/user_add.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: user_add.php 20561 2009-05-12 19:35:39Z juliomontoya $
<?php // $Id: user_add.php 22024 2009-07-13 09:21:43Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -209,7 +209,7 @@ foreach($extra as $id => $field_details)
$form->applyFilter('extra_'.$field_details[1], 'trim');
break;
case USER_FIELD_TYPE_TEXTAREA:
$form->add_html_editor('extra_'.$field_details[1], $field_details[3], false);
$form->add_html_editor('extra_'.$field_details[1], $field_details[3], false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
//$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');

4
main/admin/user_edit.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: user_edit.php 20951 2009-05-23 19:07:59Z ivantcholakov $
<?php // $Id: user_edit.php 22024 2009-07-13 09:21:43Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -243,7 +243,7 @@ foreach($extra as $id => $field_details)
$form->applyFilter('extra_'.$field_details[1], 'trim');
break;
case USER_FIELD_TYPE_TEXTAREA:
$form->add_html_editor('extra_'.$field_details[1], $field_details[3], false);
$form->add_html_editor('extra_'.$field_details[1], $field_details[3], false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
//$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');

16
main/auth/inscription.php
Unescape View File

@ -1,5 +1,5 @@
<?php
// $Id: inscription.php 20488 2009-05-11 17:14:41Z cvargas1 $
// $Id: inscription.php 22024 2009-07-13 09:21:43Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -61,10 +61,6 @@ if (!empty($_GET['openid_msg']) && $_GET['openid_msg'] == 'idnotfound') {
Display::display_warning_message(get_lang('OpenIDCouldNotBeFoundPleaseRegister'));
}
$fck_attribute['Height'] = "150";
$fck_attribute['Width'] = "450";
$fck_attribute['ToolbarSet'] = "Profil";
$form = new FormValidator('registration');
// LAST NAME and FIRST NAME
$form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
@ -129,19 +125,19 @@ if (get_setting('allow_registration_as_teacher') <> 'false') {
// 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);
$form->add_html_editor('competences', get_lang('MyCompetences'), false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
}
if (api_get_setting('extended_profile') == 'true' AND api_get_setting('extendedprofile_registration','mydiplomas') == 'true')
{
$form->add_html_editor('diplomas', get_lang('MyDiplomas'), false);
$form->add_html_editor('diplomas', get_lang('MyDiplomas'), false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
}
if (api_get_setting('extended_profile') == 'true' AND api_get_setting('extendedprofile_registration','myteach') == 'true')
{
$form->add_html_editor('teach', get_lang('MyTeach'), false);
$form->add_html_editor('teach', get_lang('MyTeach'), false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
}
if (api_get_setting('extended_profile') == 'true' AND api_get_setting('extendedprofile_registration','mypersonalopenarea') == 'true')
{
$form->add_html_editor('openarea', get_lang('MyPersonalOpenArea'), false);
$form->add_html_editor('openarea', get_lang('MyPersonalOpenArea'), false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
}
if (api_get_setting('extended_profile') == 'true')
{
@ -177,7 +173,7 @@ foreach ($extra as $id => $field_details) {
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);
$form->add_html_editor('extra_'.$field_details[1], $field_details[3], false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
//$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');

16
main/auth/profile.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: profile.php 21554 2009-06-21 20:58:47Z iflorespaz $
<?php // $Id: profile.php 22024 2009-07-13 09:21:43Z ivantcholakov $
/* For licensing terms, see /dokeos_license.txt */
/**
==============================================================================
@ -133,12 +133,6 @@ if ($user_data !== false) {
$user_data['language'] = api_get_setting('platformLanguage');
}
$fck_attribute['Width'] = "100%";
$fck_attribute['Height'] = "130";
$fck_attribute['ToolbarSet'] = "Profil";
// hiding the toolbar of fckeditor
$fck_attribute['Config']['ToolbarStartExpanded']='false';
/*
* Initialize the form.
*/
@ -252,11 +246,11 @@ if (api_get_setting('extended_profile') == 'true') {
//$form->addElement('html', '<a href="#" onclick="javascript:show_extend();"> show_extend_profile</a>');
$form->addElement('static', null, '<em>'.get_lang('OptionalTextFields').'</em>');
// MY COMPETENCES
$form->add_html_editor('competences', get_lang('MyCompetences'), false);
$form->add_html_editor('competences', get_lang('MyCompetences'), false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
// MY DIPLOMAS
$form->add_html_editor('diplomas', get_lang('MyDiplomas'), false);
$form->add_html_editor('diplomas', get_lang('MyDiplomas'), false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
// WHAT I AM ABLE TO TEACH
$form->add_html_editor('teach', get_lang('MyTeach'), false);
$form->add_html_editor('teach', get_lang('MyTeach'), false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
// MY PRODUCTIONS
$form->addElement('file', 'production', get_lang('MyProductions'));
@ -264,7 +258,7 @@ if (api_get_setting('extended_profile') == 'true') {
$form->addElement('static', 'productions_list', null, $production_list);
}
// MY PERSONAL OPEN AREA
$form->add_html_editor('openarea', get_lang('MyPersonalOpenArea'), false);
$form->add_html_editor('openarea', get_lang('MyPersonalOpenArea'), false, false, array('ToolbarSet' => 'Profil', 'Width' => '100%', 'Height' => '130', 'ToolbarStartExpanded' => false));
$form->applyFilter(array('competences', 'diplomas', 'teach', 'openarea'), 'stripslashes');
$form->applyFilter(array('competences', 'diplomas', 'teach'), 'trim'); // openarea is untrimmed for maximum openness
}

4
main/inc/lib/fckeditor/toolbars/profil.php
Unescape View File

@ -31,7 +31,7 @@ $config['ToolbarSets']['Maximized'] = array(
// Sets how the editor's toolbar should start - expanded or collapsed.
// Possible values: true , false
//$config['ToolbarStartExpanded'] = true;
//$config['ToolbarStartExpanded'] = false;
//This option sets the location of the toolbar.
// Possible values: 'In' , 'None' , 'Out:[TargetId]' , 'Out:[TargetWindow]([TargetId])'
@ -45,4 +45,4 @@ $config['ToolbarSets']['Maximized'] = array(
// Here new width and height of the editor may be set.
// Possible values, examples: 300 , '250' , '100%' , ...
//$config['Width'] = '100%';
//$config['Height'] = '300';
//$config['Height'] = '130';

Write Preview
Loading…
Cancel
Save