[svn r10930] rename the conf folder to conference (to avoid confusions)

add the path to visioclassroom

main/admin/configure_extensions.php

@@ -63,17 +63,34 @@ if(isset($_POST['activeExtension'])){
 				$rs = api_sql_query($sql, __FILE__, __LINE__);
 				while($row = mysql_fetch_array($rs)){
 					
-					$sql = 'INSERT INTO '.$row['db_name'].'.'.TABLE_TOOL_LIST.' SET 
-							name="visio",
-							link="conference/",
-							image="visio.gif",
-							visibility="1",
-							admin="0",
-							address="squaregrey.gif",
-							target="_self",
-							category="authoring"';
-					
-					api_sql_query($sql, __FILE__, __LINE__);
+					if(!empty($_POST['visioconference_url']))
+					{
+						$sql = 'INSERT INTO '.$row['db_name'].'.'.TABLE_TOOL_LIST.' SET 
+								name="visio",
+								link="conference/index.php?type=conference",
+								image="visio.gif",
+								visibility="1",
+								admin="0",
+								address="squaregrey.gif",
+								target="_self",
+								category="authoring"';
+								
+						api_sql_query($sql, __FILE__, __LINE__);		
+					}
+					if(!empty($_POST['visioclassroom_url']))
+					{
+						$sql = 'INSERT INTO '.$row['db_name'].'.'.TABLE_TOOL_LIST.' SET 
+								name="visio",
+								link="conference/index.php?type=classroom",
+								image="visio.gif",
+								visibility="1",
+								admin="0",
+								address="squaregrey.gif",
+								target="_self",
+								category="authoring"';
+								
+						api_sql_query($sql, __FILE__, __LINE__);
+					}					
 	
 				}
 				$message = get_lang('ServiceActivated');

main/conference/index.php

@@ -1,3 +1,3 @@
 <?php
-header('Location: liveconf.php');
+header('Location: liveconf.php?'.$_SERVER['QUERY_STRING']);
 ?>

main/conference/liveconf.php

@@ -10,8 +10,15 @@ api_protect_course_script();
 //$nameTool = get_lang('conference');
 //Display::display_header($nameTool);
 
+if($_GET['type'] == 'classroom')
+{
+	$visio_link = api_get_setting('service_visio','visioclassroom_url');
+}
+else if($_GET['type'] == 'conference')
+{
+	$visio_link = api_get_setting('service_visio','visioconference_url');
+}
 
-$visio_link = api_get_setting('service_visio','url');
 
 ?>
 <span align="center">

main/course_home/activity.php

@@ -286,7 +286,7 @@ function show_tools_category($course_tool_category)
 				$class='';
 
 			$qm_or_amp = ((strpos($toolsRow['link'], '?') === FALSE) ? '?' : '&');
-				if($toolsRow['name']=='visio'){
+				if(strpos($toolsRow['name'],'visio_')!==false){
 					echo "\t" . ' &nbsp <a ' . $class . ' href="#" onclick="window.open(\'' . htmlspecialchars($toolsRow['link']) . '\',\'window_visio\',config=\'height=\'+(screen.height)+\', width=\'+(screen.width-20)+\', toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no\')" target="' . $toolsRow['target'] . '">&nbsp;&nbsp;';
 				}
 				else {

main/inc/lib/add_course.lib.inc.php

@@ -1403,10 +1403,13 @@ function fill_Db_course($courseDbName, $courseRepository, $language)
 	api_sql_query("INSERT INTO `" . $tbl_course_homepage . "` VALUES ('', '" . TOOL_GROUP . "','group/group.php','group.gif','".string2binary(api_get_setting('course_create_active_tools', 'groups')) . "','0','squaregrey.gif','NO','_self','interaction')");
 	api_sql_query("INSERT INTO `" . $tbl_course_homepage . "` VALUES ('', '" . TOOL_CHAT . "','chat/chat.php','chat.gif','".string2binary(api_get_setting('course_create_active_tools', 'chat')) . "','0','squaregrey.gif','NO','_self','interaction')");
 	api_sql_query("INSERT INTO `" . $tbl_course_homepage . "` VALUES ('', '" . TOOL_STUDENTPUBLICATION . "','work/work.php','works.gif','".string2binary(api_get_setting('course_create_active_tools', 'student_publications')) . "','0','squaregrey.gif','NO','_self','interaction')");
-	
+
 	
 	if(api_get_setting('service_visio','active')=='true'){
-		api_sql_query("INSERT INTO `" . $tbl_course_homepage . "` VALUES ('', '" . TOOL_VISIO . "','conference/','visio.gif','1','0','squaregrey.gif','NO','_self','authoring')");
+		if(api_get_setting('service_visio','visioconference_url'))
+			api_sql_query("INSERT INTO `" . $tbl_course_homepage . "` VALUES ('', '" . TOOL_VISIO_CONFERENCE . "','conference/index.php?type=conference','visio.gif','1','0','squaregrey.gif','NO','_self','authoring')");
+		if(api_get_setting('service_visio','visioclassroom_url'))
+			api_sql_query("INSERT INTO `" . $tbl_course_homepage . "` VALUES ('', '" . TOOL_VISIO_CLASSROOM . "','conference/index.php?type=classroom','visio.gif','1','0','squaregrey.gif','NO','_self','authoring')");
 	}
 	
 	// Smartblogs (Kevin Van Den Haute :: kevin@develop-it.be)

main/inc/lib/main_api.lib.php

@@ -115,6 +115,8 @@ define('TOOL_COURSE_RIGHTS_OVERVIEW', 'course_rights');
 define('TOOL_UPLOAD','file_upload');
 define('TOOL_COURSE_MAINTENANCE','course_maintenance');
 define('TOOL_VISIO','visio');
+define('TOOL_VISIO_CONFERENCE','visio_conference');
+define('TOOL_VISIO_CLASSROOM','visio_classroom');
 define('TOOL_SURVEY','survey');
 
 // CONSTANTS defining dokeos sections

main/install/dokeos_main.sql

@@ -190,12 +190,13 @@ 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','conf.gif',0,0,'external'),
-(19,'learnpath','newscorm/lp_controller.php','scorm.gif',5,1,'basic'),
-(20,'blog','blog/blog.php','blog.gif',1,2,'basic'),
-(21,'blog_management','blog/blog_admin.php','blog_admin.gif',1,2,'courseadmin'),
-(22,'course_maintenance','course_info/maintenance.php','backup.gif',2,3,'courseadmin'),
-(23,'survey','survey/survey_list.php','survey.gif',2,1,'courseadmin');
+(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','newscorm/lp_controller.php','scorm.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,'courseadmin');
 UNLOCK TABLES;
 /*!40000 ALTER TABLE `course_module` ENABLE KEYS */;