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

Remove visio code, replaced by plugins (bbb, openmeetings)

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent a2fc8cecaf
commit 4a6e788589
10 changed files with 19 additions and 59 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. 4
      app/Migrations/Schema/V111/Version111.php
  2. 1
      main/inc/lib/api.lib.php
  3. 21
      main/inc/lib/course_home.lib.php
  4. 1
      main/inc/lib/statistics.lib.php
  5. 25
      main/install/data.sql
  6. 5
      main/install/profiles/hr.json
  7. 3
      main/permissions/all_permissions.inc.php
  8. 1
      main/ticket/report.php
  9. 16
      tests/main/conference/get_translation.lib.test.php
  10. 1
      tests/test_suite.php

4
app/Migrations/Schema/V111/Version111.php
Unescape View File

@ -304,9 +304,9 @@ class Version111 extends AbstractMigrationChamilo
}
$this->addSql('DELETE FROM settings_current WHERE variable = "service_visio"');
$this->addSql('DELETE FROM settings_current WHERE variable = "course_create_active_tools" AND subkey = "online_conference"');
$this->addSql('DELETE FROM settings_options WHERE variable = "visio_use_rtmpt"');
$this->addSql('DELETE FROM course_module WHERE name = "conference"');
}
/**

1
main/inc/lib/api.lib.php
Unescape View File

@ -121,7 +121,6 @@ define('TOOL_USER', 'user');
define('TOOL_GROUP', 'group');
define('TOOL_BLOGS', 'blog_management');
define('TOOL_CHAT', 'chat');
define('TOOL_CONFERENCE', 'conference');
define('TOOL_STUDENTPUBLICATION', 'student_publication');
define('TOOL_TRACKING', 'tracking');
define('TOOL_HOMEPAGE_LINK', 'homepage_link');

21
main/inc/lib/course_home.lib.php
Unescape View File

@ -828,21 +828,12 @@ class CourseHome
'target' => $tool['target']
);
} else {
if (count(explode('type=classroom', $tool['link'])) == 2 || count(explode('type=conference', $tool['link'])) == 2) {
$tool_link_params = array(
'id' => 'tooldesc_'.$toolId,
'href' => $tool['link'],
'class' => $class,
'target' => '_blank'
);
} else {
$tool_link_params = array(
'id' => 'tooldesc_'.$toolId,
'href' => $tool['link'],
'class' => $class,
'target' => $tool['target']
);
}
$tool_link_params = array(
'id' => 'tooldesc_'.$toolId,
'href' => $tool['link'],
'class' => $class,
'target' => $tool['target']
);
}
$tool_name = self::translate_tool_name($tool);

1
main/inc/lib/statistics.lib.php
Unescape View File

@ -579,7 +579,6 @@ class Statistics
'assignment',
'calendar_event',
'chat',
'conference',
'course_description',
'document',
'dropbox',

25
main/install/data.sql
Unescape View File

@ -49,7 +49,6 @@ VALUES
('course_create_active_tools','users','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Users', 0),
('course_create_active_tools','groups','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Groups', 0),
('course_create_active_tools','chat','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'Chat', 0),
('course_create_active_tools','online_conference','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'OnlineConference', 0),
('course_create_active_tools','student_publications','checkbox','Tools','true','CourseCreateActiveToolsTitle','CourseCreateActiveToolsComment',NULL,'StudentPublications', 0),
('allow_personal_agenda',NULL,'radio','User','true','AllowPersonalAgendaTitle','AllowPersonalAgendaComment',NULL,NULL, 0),
('display_coursecode_in_courselist',NULL,'radio','Platform','false','DisplayCourseCodeInCourselistTitle','DisplayCourseCodeInCourselistComment',NULL,NULL, 0),
@ -734,19 +733,17 @@ INSERT INTO course_module VALUES
(15,'course_setting','course_info/infocours.php','reference.gif',1,1,'courseadmin'),
(16,'External','','external.gif',0,0,'external'),
(17,'AddedLearnpath','','scormbuilder.gif',0,0,'external'),
(18,'conference','conference/index.php?type=conference','conf.gif',0,0,'external'),
(19,'conference','conference/index.php?type=classroom','conf.gif',0,0,'external'),
(20,'learnpath','lp/lp_controller.php','scorms.gif',5,1,'basic'),
(21,'blog','blog/blog.php','blog.gif',1,2,'basic'),
(22,'blog_management','blog/blog_admin.php','blog_admin.gif',1,2,'courseadmin'),
(23,'course_maintenance','course_info/maintenance.php','backup.gif',2,3,'courseadmin'),
(24,'survey','survey/survey_list.php','survey.gif',2,1,'basic'),
(25,'wiki','wiki/index.php','wiki.gif',2,3,'basic'),
(26,'gradebook','gradebook/index.php','gradebook.gif',2,2,'basic'),
(27,'glossary','glossary/index.php','glossary.gif',2,1,'basic'),
(28,'notebook','notebook/index.php','notebook.gif',2,1,'basic'),
(29,'attendance','attendance/index.php','attendance.gif',2,1,'basic'),
(30,'course_progress','course_progress/index.php','course_progress.gif',2,1,'basic');
(18,'learnpath','lp/lp_controller.php','scorms.gif',5,1,'basic'),
(19,'blog','blog/blog.php','blog.gif',1,2,'basic'),
(20,'blog_management','blog/blog_admin.php','blog_admin.gif',1,2,'courseadmin'),
(21,'course_maintenance','course_info/maintenance.php','backup.gif',2,3,'courseadmin'),
(22,'survey','survey/survey_list.php','survey.gif',2,1,'basic'),
(23,'wiki','wiki/index.php','wiki.gif',2,3,'basic'),
(24,'gradebook','gradebook/index.php','gradebook.gif',2,2,'basic'),
(25,'glossary','glossary/index.php','glossary.gif',2,1,'basic'),
(26,'notebook','notebook/index.php','notebook.gif',2,1,'basic'),
(27,'attendance','attendance/index.php','attendance.gif',2,1,'basic'),
(28,'course_progress','course_progress/index.php','course_progress.gif',2,1,'basic');
INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable, created_at) VALUES (1, 1, 'legal_accept','Legal',0,0, NOW());
INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable, created_at) VALUES (1, 1, 'already_logged_in','Already logged in',0,0, NOW());

5
main/install/profiles/hr.json
Unescape View File

@ -84,11 +84,6 @@
"subkey": "chat",
"selected_value": "false"
},
{
"variable": "course_create_active_tools",
"subkey": "online_conference",
"selected_value": "false"
},
{
"variable": "course_create_active_tools",
"subkey": "student_publications",

3
main/permissions/all_permissions.inc.php
Unescape View File

@ -29,10 +29,7 @@ $tool_rights[TOOL_ANNOUNCEMENT]=array("View","Add","Edit","Delete","Visibility",
$tool_rights[TOOL_USER]=array("View","Add","Edit","Delete");
//$tool_rights[TOOL_GROUP]=array("View","Add","Edit","Delete");
//$tool_rights[TOOL_CHAT]=array("View","Delete");
//$tool_rights[TOOL_CONFERENCE]=array("View","Add","Edit","Delete");
//$tool_rights[TOOL_STUDENTPUBLICATION]=array("View","Add","Edit","Delete");
// this value can be checkbox or image
$setting_visualisation='image';
?>

1
main/ticket/report.php
Unescape View File

@ -72,7 +72,6 @@ $tools['announcement'] = array('id' => 'announcement', 'name' => get_lang('Annou
// $tools[]= array('id'=>'assignment','name'=>get_lang('Assignment'));
$tools['calendar_event'] = array('id' => 'calendar_event', 'name' => get_lang('Calendar_event'));
$tools['chat'] = array('id' => 'chat', 'name' => get_lang('Chat'));
$tools['conference'] = array('id' => 'conference', 'name' => get_lang('Conference'));
$tools['course_description'] = array('id' => 'course_description', 'name' => get_lang('Course_description'));
$tools['document'] = array('id' => 'document', 'name' => get_lang('Document'));
$tools['dropbox'] = array('id' => 'dropbox', 'name' => get_lang('Dropbox'));

16
tests/main/conference/get_translation.lib.test.php
Unescape View File

@ -1,16 +0,0 @@
<?php
require_once(api_get_path(SYS_CODE_PATH).'conference/get_translation.lib.php');
class TestGetTranslation extends UnitTestCase {
public function __construct() {
$this->UnitTestCase('Conference translation getter library - main/conference/get_translation.lib.test.php');
}
function testget_language_file_as_xml(){
ob_start();
$res=get_language_file_as_xml($language='english');
ob_end_clean();
$this->assertTrue(is_string($res));
}
}

1
tests/test_suite.php
Unescape View File

@ -116,7 +116,6 @@ class TestsSuite extends TestSuite
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/auth/lost_password.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/auth/openid/xrds.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/chat/chat_functions.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/conference/get_translation.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/exercise/hotpotatoes.lib.test.php');
$this->addFile(api_get_path(SYS_TEST_PATH).'/main/lp/scorm.lib.test.php');
//$this->addFile(api_get_path(SYS_TEST_PATH).'/main/survey/survey.lib.test.php');

Write Preview
Loading…
Cancel
Save