Duplicate inclusions of the library 'text.lib.php' have been removed.

skala
Ivan Tcholakov 16 years ago
parent 4f1f351e61
commit 401a73c826
  1. 1
      main/admin/sub_language.php
  2. 1
      main/admin/sub_language_add.php
  3. 1
      main/blog/blog.php
  4. 5
      main/chat/chat_message.php
  5. 2
      main/exercice/exercice_submit.php
  6. 19
      main/exercice/hotspot_admin.inc.php
  7. 1
      main/exercice/mark_free_answer.php
  8. 53
      main/exercice/unique_answer.class.php
  9. 1
      main/forum/forumfunction.inc.php
  10. 1
      main/forum/index.php
  11. 5
      main/messages/new_message.php
  12. 3
      main/newscorm/learnpath_functions.inc.php
  13. 4
      main/newscorm/resourcelinker.php
  14. 23
      main/social/groups.php
  15. 5
      main/wiki/index.php
  16. 1
      main/work/work.php

@ -62,7 +62,6 @@ $tool_name = get_lang('CreateSubLanguage');
$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array ('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
require_once api_get_path(LIBRARY_PATH).'text.lib.php';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {

@ -25,7 +25,6 @@ $tool_name = get_lang('CreateSubLanguage');
$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array ('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
require_once api_get_path(LIBRARY_PATH).'text.lib.php';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
/**

@ -31,7 +31,6 @@ if(isset($_GET['id_session'])) {
$lib_path = api_get_path(LIBRARY_PATH);
require_once $lib_path.'display.lib.php';
require_once $lib_path.'text.lib.php';
require_once $lib_path.'blog.lib.php';
require_once $lib_path.'fckeditor/fckeditor.php';

@ -61,7 +61,6 @@ if (empty($_user['user_id'])) {
// if we have the session set up
if (!empty($course) && !empty($_user['user_id'])) {
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'text.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
/* Constants and variables */
@ -244,8 +243,8 @@ if (!empty($course) && !empty($_user['user_id'])) {
<table border="0" cellpadding="5" cellspacing="0" width="100%">
<tr>
<td width="320" valign="middle">
<?php $talkboxsize=(api_get_course_setting('allow_open_chat_window')) ? 'width: 350px; height: 35px' : 'width: 450px; height: 35px'; ?>
<?php $talkboxsize=(api_get_course_setting('allow_open_chat_window')) ? 'width: 350px; height: 35px' : 'width: 450px; height: 35px'; ?>
<textarea name="message" style=" <?php echo $talkboxsize; ?>" onkeydown="send_message(event);" onclick="javascript: insert_smile(this);"></textarea>
</td>
<td>

@ -56,8 +56,6 @@ if (!ereg("MSIE",$_SERVER["HTTP_USER_AGENT"])) {
// notice for unauthorized people.
api_protect_course_script(true);
require_once api_get_path(LIBRARY_PATH) . 'text.lib.php';
$is_allowedToEdit = api_is_allowed_to_edit(null,true);
$_configuration['live_exercise_tracking'] = true;

@ -7,7 +7,6 @@
* @author Toon Keppens
* @version $Id: admin.php 10680 2007-01-11 21:26:23Z pcool $
*/
require_once(api_get_path(LIBRARY_PATH).'text.lib.php');
// ALLOWED_TO_INCLUDE is defined in admin.php
if(!defined('ALLOWED_TO_INCLUDE')) {
@ -174,7 +173,7 @@ if($modifyAnswers)
$reponse[$i]=$objAnswer->selectAnswer($i);
if ($objExercise->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) {
$comment[$i]=$objAnswer->selectComment($i);
}
}
$weighting[$i]=$objAnswer->selectWeighting($i);
$hotspot_coordinates[$i]=$objAnswer->selectHotspotCoordinates($i);
$hotspot_type[$i]=$objAnswer->selectHotspotType($i);
@ -302,15 +301,15 @@ if($modifyAnswers)
-->
<tr>
<th width="5" >&nbsp;<?php /* echo get_lang('HotSpot'); */ ?></th>
<?php if ($objExercise->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
<th><?php echo get_lang('HotspotDescription'); ?>*</th>
<th><?php echo get_lang('HotspotDescription'); ?>*</th>
<th><?php echo get_lang('Comment'); ?></th>
<?php } else { ?>
<th colspan="2"><?php echo get_lang('HotspotDescription'); ?>*</th>
<?php } ?>
<?php } ?>
<th><?php echo get_lang('QuestionWeighting'); ?>*</th>
</tr>
@ -318,8 +317,8 @@ if($modifyAnswers)
for($i=1;$i <= $nbrAnswers;$i++) {
?>
<tr>
<td valign="top"><div style="height: 15px; width: 15px; background-color: <?php echo $hotspot_colors[$i]; ?>"> </div></td>
<?php if ($objExercise->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
<td valign="top"><div style="height: 15px; width: 15px; background-color: <?php echo $hotspot_colors[$i]; ?>"> </div></td>
<?php if ($objExercise->selectFeedbackType() != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
<td valign="top" align="left"><input type="text" name="reponse[<?php echo $i; ?>]" value="<?php echo api_htmlentities($reponse[$i], ENT_QUOTES, api_get_system_encoding()); ?>" size="45" /></td>
<?php
require_once(api_get_path(LIBRARY_PATH) . "/fckeditor/fckeditor.php");
@ -337,7 +336,7 @@ if($modifyAnswers)
<?php } else { ?>
<td valign="top" align="left" colspan="2"><input type="text" name="reponse[<?php echo $i; ?>]" value="<?php echo api_htmlentities($reponse[$i], ENT_QUOTES, api_get_system_encoding()); ?>" size="45" /></td>
<?php } ?>
<td valign="top"><input type="text" name="weighting[<?php echo $i; ?>]" size="5" value="<?php echo (isset($weighting[$i]) ? float_format($weighting[$i],1) : 10); ?>" />
<input type="hidden" name="hotspot_coordinates[<?php echo $i; ?>]" value="<?php echo (empty($hotspot_coordinates[$i]) ? '0;0|0|0' : $hotspot_coordinates[$i]); ?>" />
<input type="hidden" name="hotspot_type[<?php echo $i; ?>]" value="<?php echo (empty($hotspot_type[$i]) ? 'square' : $hotspot_type[$i]); ?>" /></td>

@ -43,7 +43,6 @@ include('../inc/global.inc.php');
include('exercise.class.php');
include('question.class.php');
include('answer.class.php');
include_once(api_get_path(LIBRARY_PATH).'text.lib.php');
// answer types
define('UNIQUE_ANSWER', 1);

@ -45,7 +45,7 @@ class UniqueAnswer extends Question {
function createAnswersForm ($form) {
// getting the exercise list
$obj_ex =$_SESSION['objExercise'];
$editor_config = array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '125');
//this line define how many question by default appear when creating a choice question
@ -113,10 +113,9 @@ class UniqueAnswer extends Question {
$question_list=$obj_ex->selectQuestionList();
$select_question=array();
$select_question[0]=get_lang('SelectTargetQuestion');
require_once('../newscorm/learnpathList.class.php');
require_once(api_get_path(LIBRARY_PATH).'text.lib.php');
require_once '../newscorm/learnpathList.class.php';
if (is_array($question_list)) {
foreach ($question_list as $key=>$questionid) {
//To avoid warning messages
@ -144,15 +143,15 @@ class UniqueAnswer extends Question {
}
$temp_scenario=array();
if ($nb_answers < 1) {
$nb_answers = 1;
Display::display_normal_message(get_lang('YouHaveToCreateAtLeastOneAnswer'));
}
for($i = 1 ; $i <= $nb_answers ; ++$i)
{
$form -> addElement ('html', '<tr>');
if(is_object($answer))
{
@ -160,35 +159,35 @@ class UniqueAnswer extends Question {
{
$correct = $i;
}
$defaults['answer['.$i.']'] = $answer -> answer[$i];
$defaults['comment['.$i.']'] = $answer -> comment[$i];
$defaults['weighting['.$i.']'] = float_format($answer -> weighting[$i], 1);
$item_list=explode('@@',$answer -> destination[$i]);
//echo '<pre>'; print_r($item_list);
$try = $item_list[0];
$lp = $item_list[1];
$list_dest= $item_list[2];
$url=$item_list[3];
if ($try==0)
$try_result=0;
else
$try_result=1;
if ($url==0)
$url_result='';
else
$url_result=$url;
$temp_scenario['url'.$i]=$url_result;
$temp_scenario['try'.$i]=$try_result;
$temp_scenario['lp'.$i]=$lp;
$temp_scenario['destination'.$i]=$list_dest;
/*$pre_list_destination=explode(';',$list_dest);
$list_destination=array();
foreach($pre_list_destination as $value)
@ -203,18 +202,18 @@ class UniqueAnswer extends Question {
$defaults['weighting[1]'] = 10;
$defaults['answer[2]'] = get_lang('langDefaultUniqueAnswer2');
$defaults['weighting[2]'] = 0;
$temp_scenario['destination'.$i] = array('0');
$temp_scenario['lp'.$i] = array('0');
//$defaults['scenario']
}
$defaults['scenario']=$temp_scenario;
$defaults['scenario']=$temp_scenario;
$renderer = & $form->defaultRenderer();
$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>');
$answer_number=$form->addElement('text', null,null,'value="'.$i.'"');
$answer_number->freeze();
$form->addElement('radio', 'correct', null, null, $i, 'class="checkbox" style="margin-left: 0em;"');
$form->addElement('html_editor', 'answer['.$i.']', null, 'style="vertical-align:middle"', $editor_config);
$form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
@ -231,13 +230,13 @@ class UniqueAnswer extends Question {
$group['lp'.$i] =&$form->createElement('select', 'lp'.$i,get_lang('SeeTheory').': ',$select_lp_id);
$group['destination'.$i]=&$form->createElement('select', 'destination'.$i, get_lang('GoToQuestion').': ' ,$select_question);
$group['url'.$i] =&$form->createElement('text', 'url'.$i,get_lang('Other').': ',array('size'=>'25px'));
$form -> addGroup($group, 'scenario', 'scenario');
$renderer->setGroupElementTemplate('<div class="exercise_scenario_label">{label}</div><div class="exercise_scenario_element">{element}</div>','scenario');
}
//$form->addElement('select', 'destination'.$i, get_lang('SelectQuestion').' : ',$select_question,'multiple');
$form->addElement('text', 'weighting['.$i.']',null, 'style="vertical-align:middle;margin-left: 0em;" size="5" value="0"');
$form -> addElement ('html', '</tr>');
}
@ -245,7 +244,7 @@ class UniqueAnswer extends Question {
$form -> addElement ('html', '</table>');
$form -> addElement ('html', '<br />');
$navigator_info = api_get_navigator();
global $text, $class, $show_quiz_edition;
//ie6 fix
if ($show_quiz_edition) {
@ -260,8 +259,8 @@ class UniqueAnswer extends Question {
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');
}
}
$renderer->setElementTemplate('{element}','submitQuestion');
$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');
$renderer->setElementTemplate('{element}','submitQuestion');
$renderer->setElementTemplate('{element}&nbsp;','lessAnswers');
$renderer->setElementTemplate('{element}','moreAnswers');
$form -> addElement ('html', '</div></div>');
@ -271,7 +270,7 @@ class UniqueAnswer extends Question {
$correct=1;
}
$defaults['correct'] = $correct;
if (!empty($this -> id)) {
$form -> setDefaults($defaults);
} else {

@ -23,7 +23,6 @@
*/
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'text.lib.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';

@ -51,7 +51,6 @@ $this_section=SECTION_COURSES;
api_protect_course_script(true);
// including additional library scripts
require_once api_get_path(LIBRARY_PATH).'text.lib.php';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
$nameTools=get_lang('Forums');

@ -25,7 +25,6 @@ if (api_get_setting('allow_message_tool')!='true'){
api_not_allowed();
}
require_once api_get_path(LIBRARY_PATH).'text.lib.php';
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
require_once api_get_path(LIBRARY_PATH).'message.lib.php';
@ -198,11 +197,11 @@ function manage_form ($default, $select_from_user_list = null) {
$message_reply_info = MessageManager::get_message_by_id($_GET['re_id']);
$form->addElement('hidden','re_id',Security::remove_XSS($_GET['re_id']));
$form->addElement('hidden','save_form','save_form');
//adding reply mail
$user_reply_info = UserManager::get_user_info_by_id($message_reply_info['user_sender_id']);
$default['content']='<p></p>'.api_get_person_name($user_reply_info['firstname'],$user_reply_info['lastname']).' '.get_lang('Wrote').' :<i> <br />'.api_html_entity_decode($message_reply_info['content'],ENT_QUOTES,$charset).'</i>';
}
if (empty($group_id)) {
$form->addElement('html','<div class="row"><div class="label">'.get_lang('FilesAttachment').'</div><div class="formw">

@ -1394,8 +1394,6 @@ function export_exercise($item_id)
define('MATCHING', 4);
define('FREE_ANSWER', 5);
include_once api_get_path(LIBRARY_PATH).'text.lib.php';
$TBL_EXERCISES = Database :: get_course_table(TABLE_QUIZ_TEST);
/*******************************/
@ -1605,7 +1603,6 @@ function exportitem($id, $item_id, $item_type, $add_scorm_communications = false
include_once '../lang/english/exercice.inc.php';
include_once '../lang/'.$language_interface.'/exercice.inc.php';
include_once api_get_path(LIBRARY_PATH).'text.lib.php';
include_once '../resourcelinker/resourcelinker.inc.php';
$LPname = display_addedresource_link_in_learnpath($item_type, $item_id, '', $id, 'builder', 'nolink');

@ -145,7 +145,7 @@ if (!empty ($_POST['external_link_submit'])) {
{
$external_link = 'http://'.$external_link;
}
$sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
$result = Database::query($sql);
$addedresource[] = "Link";
@ -701,7 +701,6 @@ if ($from_learnpath != 'yes')
// Agenda items -->
if ($content == "Agenda")
{
include_once api_get_path(LIBRARY_PATH).'text.lib.php';
$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
$TABLE_ITEM_PROPERTY = Database::get_course_table(TABLE_ITEM_PROPERTY);
@ -779,7 +778,6 @@ if ($content == "Document" OR (empty($content) AND (is_allowed_to_edit() OR in_a
*/
if ($content == "Ad_Valvas")
{
include_once api_get_path(LIBRARY_PATH).'text.lib.php';
$tbl_announcement = Database :: get_course_table(TABLE_ANNOUNCEMENT);
$sql = "SELECT * FROM ".$tbl_announcement." a, ".$item_property_table." i WHERE i.tool = '".TOOL_ANNOUNCEMENT."' AND a.id=i.ref AND i.visibility='1' AND i.to_group_id = 0 AND i.to_user_id IS NULL ORDER BY a.display_order ASC";
//error_log($sql,0);

@ -11,7 +11,6 @@ require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
require_once api_get_path(LIBRARY_PATH).'social.lib.php';
require_once api_get_path(LIBRARY_PATH).'message.lib.php';
require_once api_get_path(LIBRARY_PATH).'text.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
api_block_anonymous_users();
@ -432,32 +431,32 @@ if ($group_id != 0 ) {
}
// display groups (newest, mygroups, pop)
echo '<div class="social-box-main1">';
if (isset($_GET['view']) && in_array($_GET['view'],$allowed_views)) {
$view_group = $_GET['view'];
switch ($view_group) {
case 'mygroups' :
if (count($grid_my_groups) > 0) {
echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';
Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
}
if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
if (empty($grid_my_groups)) {
echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
}
}
break;
case 'newest' :
if (count($grid_newest_groups) > 0) {
echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('Newest')).'</div>';
Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false));
}
if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
if (empty($grid_newest_groups)) {
echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
@ -469,16 +468,16 @@ if ($group_id != 0 ) {
echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('Popular')).'</div>';
Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
}
if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
if (empty($grid_pop_groups)) {
echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
}
}
break;
}
} else {
} else {
if (count($grid_my_groups) > 0) {
echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('MyGroups')).'</div>';
Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false));
@ -491,13 +490,13 @@ if ($group_id != 0 ) {
echo '<div class="social-groups-text3">'.api_strtoupper(get_lang('Popular')).'</div>';
Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true));
}
if (api_is_platform_admin() || api_get_setting('allow_students_to_create_groups_in_social') == 'true') {
if (empty($grid_my_groups) && empty($grid_newest_groups) && empty($grid_pop_groups) ) {
echo '<a href="group_add.php">'.get_lang('YouShouldCreateAGroup').'</a>';
}
}
}
echo '</div>';

@ -22,7 +22,6 @@ $this_section=SECTION_COURSES;
require_once api_get_path(LIBRARY_PATH).'course.lib.php';
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'text.lib.php';
require_once api_get_path(LIBRARY_PATH).'security.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php';
@ -1199,13 +1198,13 @@ if ($_GET['action']=='showpage' AND !isset($_POST['SaveWikiNew']))
if ($_GET['action']=='edit')
{
if (api_get_session_id()!=0 && api_is_allowed_to_session_edit(false,true)==false) {
api_not_allowed();
}
$_clean['group_id']=(int)$_SESSION['_gid'];
$sql='SELECT * FROM '.$tbl_wiki.', '.$tbl_wiki_conf.' WHERE '.$tbl_wiki_conf.'.page_id='.$tbl_wiki.'.page_id AND '.$tbl_wiki.'.reflink="'.Database::escape_string($page).'" AND '.$tbl_wiki.'.'.$groupfilter.$condition_session.' ORDER BY id DESC';
$result=Database::query($sql);

@ -78,7 +78,6 @@ require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'text.lib.php';
require_once api_get_path(LIBRARY_PATH).'fckeditor/fckeditor.php';
// Section (for the tabs)

Loading…
Cancel
Save