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 r21933] FS#2867 - The FCKEditor, all introduction sections: Eliminating the global variable $fck_attribute.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent 3ad5d561b1
commit b8bf14f443
22 changed files with 6369 additions and 6464 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. 6
      main/announcements/announcements.php
  2. 4
      main/blog/blog.php
  3. 6
      main/calendar/agenda.php
  4. 6
      main/course_description/index.php
  5. 10
      main/document/document.php
  6. 6
      main/dropbox/index.php
  7. 6
      main/exercice/exercice.php
  8. 14
      main/exercice/export/exercise_import.php
  9. 8
      main/forum/forumsearch.php
  10. 6
      main/forum/index.php
  11. 4
      main/glossary/index.php
  12. 18
      main/gradebook/index.php
  13. 8
      main/group/group.php
  14. 6
      main/group/group_space.php
  15. 10
      main/inc/lib/search/search_widget.php
  16. 8
      main/link/link.php
  17. 15
      main/newscorm/lp_list.php
  18. 6
      main/notebook/index.php
  19. 8
      main/survey/survey_list.php
  20. 6
      main/user/user.php
  21. 4
      main/wiki/index.php
  22. 10
      main/work/work.php

6
main/announcements/announcements.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: announcements.php 21120 2009-05-30 23:07:10Z iflorespaz $
<?php //$Id: announcements.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -802,14 +802,10 @@ if (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_ed
Tool introduction
====================================================*/
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
if (empty($_GET['origin']) || $_GET['origin'] !== 'learnpath') {
//api_display_tool_title($nameTools);
Display::display_introduction_section(TOOL_ANNOUNCEMENT);
}
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*

4
main/blog/blog.php
Unescape View File

@ -295,11 +295,7 @@ echo '<div class=actions>';
echo '</div>';
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_BLOG);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
//Display::display_header($nameTools,'Blogs');
?>

6
main/calendar/agenda.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: agenda.php 21139 2009-05-31 19:14:47Z pcool $
<?php //$Id: agenda.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -232,11 +232,7 @@ $is_allowed_to_edit = api_is_allowed_to_edit(false,true) OR (api_get_course_sett
//api_display_tool_title($nameTools);
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_CALENDAR_EVENT);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// insert an anchor (top) so one can jump back to the top of the page
echo '<a name="top"></a>';

6
main/course_description/index.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: index.php 20808 2009-05-18 19:49:10Z juliomontoya $
<?php // $Id: index.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/* For licensing terms, see /dokeos_license.txt */
/**
==============================================================================
@ -69,11 +69,7 @@ $nameTools = get_lang(TOOL_COURSE_DESCRIPTION);
Introduction section
-----------------------------------------------------------
*/
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_COURSE_DESCRIPTION);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// These settings are for the other instances of the online editor.

10
main/document/document.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: document.php 21696 2009-07-01 17:42:04Z iflorespaz $
<?php // $Id: document.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -353,18 +353,14 @@ if($to_group_id !=0) //add group name after for group documents
(editable by course admins)
-----------------------------------------------------------
*/
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
if(!empty($_SESSION['_gid']))
{
Display::display_introduction_section(TOOL_DOCUMENT.$_SESSION['_gid'],'left');
Display::display_introduction_section(TOOL_DOCUMENT.$_SESSION['_gid']);
}
else
{
Display::display_introduction_section(TOOL_DOCUMENT,'left');
Display::display_introduction_section(TOOL_DOCUMENT);
}
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*============================================================================*/

6
main/dropbox/index.php
Unescape View File

@ -121,11 +121,7 @@ $dropbox_unid = md5( uniqid( rand( ), true));
*/
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_DROPBOX,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_DROPBOX);
/*
-----------------------------------------------------------

6
main/exercice/exercice.php
Unescape View File

@ -1,5 +1,5 @@
<?php
// $Id: exercice.php 21708 2009-07-01 20:43:00Z iflorespaz $
// $Id: exercice.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/*
==============================================================================
@ -531,11 +531,7 @@ include_once (api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
event_access_tool(TOOL_QUIZ);
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display :: display_introduction_section(TOOL_QUIZ);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// selects $limitExPage exercises at the same time
$from = $page * $limitExPage;

14
main/exercice/export/exercise_import.php
Unescape View File

@ -102,15 +102,13 @@ include api_get_path(INCLUDE_PATH) . '/header.inc.php';
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
// TODO: These settings to be checked when it is possible.
$fck_attribute['Config']['CreateDocumentWebDir'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/document/';
$fck_attribute['Config']['CreateDocumentDir'] = '../../../courses/'.api_get_course_path().'/document/';
$fck_attribute['Config']['BaseHref'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/';
Display::display_introduction_section(TOOL_QUIZ);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_QUIZ, array(
'CreateDocumentWebDir' => api_get_path('WEB_COURSE_PATH').api_get_course_path().'/document/',
'CreateDocumentDir' => '../../../courses/'.api_get_course_path().'/document/',
'BaseHref' => api_get_path('WEB_COURSE_PATH').api_get_course_path().'/'
)
);
//Display Forms or dialog box(if needed)

8
main/forum/forumsearch.php
Unescape View File

@ -116,14 +116,8 @@ if ($origin=='learnpath') {
// Display the tool title
// api_display_tool_title($nameTools);
// tool introduction
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_FORUM,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_FORUM);
// tracking
event_access_tool(TOOL_FORUM);

6
main/forum/index.php
Unescape View File

@ -148,11 +148,7 @@ Display :: display_header('');
//echo '<link href="forumstyles.css" rel="stylesheet" type="text/css" />';
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_FORUM,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_FORUM);
$form_count=0;

4
main/glossary/index.php
Unescape View File

@ -41,11 +41,7 @@ $interbreadcrumb[] = array ("url"=>"index.php", "name"=> get_lang('Glossary'));
Display::display_header(get_lang(ucfirst($tool)));
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_GLOSSARY,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// Glossary FckEditor setting
$fck_attribute['Width'] = '100%';

18
main/gradebook/index.php
Unescape View File

@ -83,11 +83,7 @@ if ( (isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['st
Display :: display_header(get_lang('Details'));
//Introduction tool: student view
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Gradebook';
Display::display_introduction_section(TOOL_GRADEBOOK);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'Gradebook'));
$category= $_GET['selectcat'];
$stud_id=api_get_user_id();
@ -108,11 +104,7 @@ if ( (isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['st
Display :: display_header(get_lang('Gradebook'));
//Introduction tool: student view
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Gradebook';
Display::display_introduction_section(TOOL_GRADEBOOK);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'Gradebook'));
$stud_id=api_get_user_id();
$course_code=api_get_course_id();
@ -758,11 +750,7 @@ if (api_is_platform_admin() || api_is_allowed_to_create_course() || $status==1)
*/
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Gradebook';
Display::display_introduction_section(TOOL_GRADEBOOK);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'Gradebook'));
if ( (isset ($_GET['selectcat']) && $_GET['selectcat']<>0) ) {
//

8
main/group/group.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: group.php 21665 2009-06-30 00:14:57Z iflorespaz $
<?php // $Id: group.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/*
==============================================================================
@ -98,11 +98,7 @@ if (!isset ($_GET['origin']) || $_GET['origin'] != 'learnpath')
Display::display_header(get_lang('Groups'));
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_GROUP,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_GROUP);
/*
* Self-registration and unregistration

6
main/group/group_space.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: group_space.php 21665 2009-06-30 00:14:57Z iflorespaz $
<?php //$Id: group_space.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -97,11 +97,7 @@ Display::display_header($nameTools.' '.stripslashes($current_group['name']),"Gro
(editable by course admin)
-----------------------------------------------------------
*/
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(group_space_.$_SESSION['_gid']);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*
-----------------------------------------------------------

10
main/inc/lib/search/search_widget.php
Unescape View File

@ -323,17 +323,13 @@ function search_widget_show($action='index.php') {
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
// TODO: Settings for the FCKEditor to be checked (insert an image for example). Probably this is a special case here.
// TODO: Settings for the online editor to be checked (insert an image for example). Probably this is a special case here.
if (api_get_course_id() !== -1)
if (!empty($_SESSION['_gid'])) {
Display::display_introduction_section(TOOL_SEARCH.$_SESSION['_gid'],'left');
Display::display_introduction_section(TOOL_SEARCH.$_SESSION['_gid']);
} else {
Display::display_introduction_section(TOOL_SEARCH,'left');
Display::display_introduction_section(TOOL_SEARCH);
}
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
$op = 'or';

8
main/link/link.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: link.php 21666 2009-06-30 00:20:57Z iflorespaz $
<?php // $Id: link.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -186,11 +186,7 @@ if(isset($_GET['action'])) {
Introduction section
-----------------------------------------------------------
*/
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_LINK,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_LINK);
if (is_allowed_to_edit() and isset($_GET['action'])) {

15
main/newscorm/lp_list.php
Unescape View File

@ -87,15 +87,12 @@ Display::display_header($nameTools,"Path");
(editable by course admins)
-----------------------------------------------------------
*/
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
// These settings should stay here.
$fck_attribute['Config']['CreateDocumentWebDir'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/document/';
$fck_attribute['Config']['CreateDocumentDir'] = '../../courses/'.api_get_course_path().'/document/';
$fck_attribute['Config']['BaseHref'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/';
Display::display_introduction_section(TOOL_LEARNPATH);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_LEARNPATH, array(
'CreateDocumentWebDir' => api_get_path('WEB_COURSE_PATH').api_get_course_path().'/document/',
'CreateDocumentDir' => '../../courses/'.api_get_course_path().'/document/',
'BaseHref' => api_get_path('WEB_COURSE_PATH').api_get_course_path().'/'
)
);
if(api_is_allowed_to_edit())

6
main/notebook/index.php
Unescape View File

@ -50,11 +50,7 @@ if ( isset($_GET['action']) && $_GET['action'] == 'editnote')
Display::display_header(get_lang(ucfirst($tool)));
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_NOTEBOOK,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display::display_introduction_section(TOOL_NOTEBOOK);
// Config notebook FckEditor buttons bar

8
main/survey/survey_list.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: survey_list.php 19694 2009-04-09 21:45:33Z ivantcholakov $
<?php // $Id: survey_list.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -27,7 +27,7 @@
* @author unknown, the initial survey that did not make it in 1.8 because of bad code
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
* @author Julio Montoya Armas <gugli100@gmail.com>, Dokeos: Personality Test modification and rewriting large parts of the code
* @version $Id: survey_list.php 19694 2009-04-09 21:45:33Z ivantcholakov $
* @version $Id: survey_list.php 21933 2009-07-09 06:08:22Z ivantcholakov $
*
* @todo use quickforms for the forms
*/
@ -80,11 +80,7 @@ Display :: display_header($tool_name,'Survey');
//api_display_tool_title($tool_name);
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section('survey', 'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// Action handling: searching
if (isset ($_GET['search']) AND $_GET['search'] == 'advanced')

6
main/user/user.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: user.php 21077 2009-05-29 16:48:33Z juliomontoya $
<?php // $Id: user.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -326,11 +326,7 @@ $is_allowed_to_track = ($is_courseAdmin || $is_courseTutor) && $_configuration['
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_USER, 'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
if ( api_is_allowed_to_edit()) {

4
main/wiki/index.php
Unescape View File

@ -166,11 +166,7 @@ MAIN CODE
*/
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_WIKI);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*
-----------------------------------------------------------

10
main/work/work.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: work.php 21161 2009-06-01 16:00:06Z cfasanando $
<?php //$Id: work.php 21933 2009-07-09 06:08:22Z ivantcholakov $
/* For licensing terms, see /dokeos_license.txt */
/**
* @package dokeos.work
@ -6,7 +6,7 @@
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
* @author Roan Embrechts, code refactoring and virtual course support
* @author Frederic Vauthier, directories management
* @version $Id: work.php 21161 2009-06-01 16:00:06Z cfasanando $
* @version $Id: work.php 21933 2009-07-09 06:08:22Z ivantcholakov $
*
* @todo refactor more code into functions, use quickforms, coding standards, ...
*/
@ -407,11 +407,7 @@ if ($origin=='learnpath') {
echo '<div style="height:15px">&nbsp;</div>';
}
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display :: display_introduction_section(TOOL_STUDENTPUBLICATION,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
Display :: display_introduction_section(TOOL_STUDENTPUBLICATION);
/*
-----------------------------------------------------------

Write Preview
Loading…
Cancel
Save