|
From: <tro...@us...> - 2008-01-18 21:50:12
|
Revision: 229
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=229&view=rev
Author: trollinger
Date: 2008-01-18 13:50:05 -0800 (Fri, 18 Jan 2008)
Log Message:
-----------
update the path of the files due to the new structure
Modified Paths:
--------------
branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php
branches/team/Thomas/moodle/mod/voicetools/index.php
branches/team/Thomas/moodle/mod/voicetools/lib.php
branches/team/Thomas/moodle/mod/voicetools/manageAction.php
branches/team/Thomas/moodle/mod/voicetools/manageActionBlock.php
branches/team/Thomas/moodle/mod/voicetools/mod.html
branches/team/Thomas/moodle/mod/voicetools/version.php
branches/team/Thomas/moodle/mod/voicetools/view.php
branches/team/Thomas/moodle/mod/voicetools/voicerecorder.php
branches/team/Thomas/moodle/mod/voicetools/welcome.php
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -32,10 +32,10 @@
require_once("../../config.php");
// require_once("lib.php");
-require_once("lib/common/WimbaXml.php");
-require_once("lib/common/WimbaCommons.php");
+require_once("lib/php/common/WimbaXml.php");
+require_once("lib/php/common/WimbaCommons.php");
if (version_compare(PHP_VERSION,'5','>=')) {
- require_once('lib/common/domxml-php4-php5.php');
+ require_once('lib/php/common/domxml-php4-php5.php');
}
// Variables needed
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -34,12 +34,12 @@
require_once("../../config.php");
require_once("lib.php");
-require_once("lib/common/WimbaXml.php");
-require_once("lib/common/WimbaCommons.php");
-require_once("lib/common/WimbaUI.php");
-require_once("lib/common/XmlResource.php");
-require_once('lib/vt/WimbaVoicetools.php');
-require_once('lib/vt/WimbaVoicetoolsAPI.php');
+require_once("lib/php/common/WimbaXml.php");
+require_once("lib/php/common/WimbaCommons.php");
+require_once("lib/php/common/WimbaUI.php");
+require_once("lib/php/common/XmlResource.php");
+require_once('lib/php/vt/WimbaVoicetools.php');
+require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
set_time_limit(30);
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -30,21 +30,21 @@
/* $Id: getXmlNewPanel.php 52710 2007-08-20 19:54:04Z thomasr $ */
/// This page is to generate the list of VT
-error_reporting(E_ERROR);
+
global $CFG;
require_once("../../config.php");
require_once("lib.php");
-require_once("lib/vt/WimbaVoicetoolsAPI.php");
-require_once("lib/vt/WimbaVoicetools.php");
-require_once("lib/common/WimbaCommons.php");
-require_once("lib/common/WimbaXml.php");
-require_once("lib/common/WimbaUI.php");
+require_once("lib/php/vt/WimbaVoicetoolsAPI.php");
+require_once("lib/php/vt/WimbaVoicetools.php");
+require_once("lib/php/common/WimbaCommons.php");
+require_once("lib/php/common/WimbaXml.php");
+require_once("lib/php/common/WimbaUI.php");
set_time_limit(30);
if (version_compare(PHP_VERSION,'5','>=')) {
- require_once('lib/common/domxml-php4-php5.php');
+ require_once('lib/php/common/domxml-php4-php5.php');
}
Modified: branches/team/Thomas/moodle/mod/voicetools/index.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/index.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/index.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -32,6 +32,7 @@
require_once("../../config.php");
require_once("lib.php");
+require_once("lib/php/common/WimbaLib.php");
$id = optional_param('id', 0, PARAM_INT); // course
$course = optional_param('course', 0, PARAM_INT);
Modified: branches/team/Thomas/moodle/mod/voicetools/lib.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -31,8 +31,8 @@
error_reporting(0);
require_once($CFG->libdir.'/datalib.php');
require_once($CFG->dirroot.'/course/lib.php');
-require_once('lib/vt/WimbaVoicetoolsAPI.php');
-require_once('lib/common/WimbaCommons.php');
+require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
+require_once('lib/php/common/WimbaCommons.php');
define("VOICETOOLS_MODULE_VERSION", "3.1.2");
$VOICETOOLS_LOGS = "logs.php"; //file use to the logs
Modified: branches/team/Thomas/moodle/mod/voicetools/manageAction.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/manageAction.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/manageAction.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -34,10 +34,10 @@
error_reporting(E_ERROR);
require_once ('../../config.php');
require_once ('lib.php');
-
-require_once ("lib/common/WimbaCommons.php");
-require_once ('lib/vt/WimbaVoicetools.php');
-require_once ('lib/vt/WimbaVoicetoolsAPI.php');
+require_once ("lib/php/common/WimbaLib.php");
+require_once ("lib/php/common/WimbaCommons.php");
+require_once ('lib/php/vt/WimbaVoicetools.php');
+require_once ('lib/php/vt/WimbaVoicetoolsAPI.php');
global $CFG;
$list_attributes = array ();
Modified: branches/team/Thomas/moodle/mod/voicetools/manageActionBlock.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/manageActionBlock.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/manageActionBlock.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -33,9 +33,9 @@
require_once('lib.php');
-require_once("lib/common/WimbaCommons.php");
-require_once('lib/vt/WimbaVoicetools.php');
-require_once('lib/vt/WimbaVoicetoolsAPI.php');
+require_once("lib/php/common/WimbaCommons.php");
+require_once('lib/php/vt/WimbaVoicetools.php');
+require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
global $CFG;
Modified: branches/team/Thomas/moodle/mod/voicetools/mod.html
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-01-18 21:50:05 UTC (rev 229)
@@ -30,162 +30,91 @@
/* $Id: mod.html 200 2008-01-09 11:37:50Z trollinger $ */
error_reporting(E_ERROR);
-require_once('lib/vt/WimbaVoicetoolsAPI.php');
-require_once('lib/vt/WimbaVoicetools.php');
+require_once("../config.php");
+require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
+require_once('lib/php/vt/WimbaVoicetools.php');
+require_once('lib/php/common/WimbaLib.php');
require_once($CFG->dirroot.'/calendar/lib.php');
require_once($CFG->dirroot.'/mod/voicetools/lib.php');
-require_once("../config.php");
+require_once($CFG->dirroot.'/version.php');
-
-$id = optional_param('id', 0, PARAM_INT);
-$roomId = optional_param('roomId',null, PARAM_RAW);
-$update = optional_param('update', false, PARAM_INT);
-require_login($course->id);
-
-function txt($string){
- $result = str_replace("<br />", "" ,$string);
- $result = str_replace("<p>", "" ,$result);
- $result = str_replace("</p>", "" ,$result);
- return $result;
-}
-
-
+//test if the current user can see this page
+require_login($course->id);
if (!isteacher($course->id, $USER->id)) { //to Be sure
error("You need to be a teacher in this course to create an instance");
}
+//get the required parameters
+$id = optional_param('id', 0, PARAM_INT);
+$roomId = optional_param('roomId',null, PARAM_RAW);
+$update = optional_param('update', null, PARAM_INT);
+$sectionId = optional_param('section', null, PARAM_INT);
/// First we check that form variables have been initialised
if (!isset($form->name)) {
$form->name = '';
}
if (!isset($form->type)) {
- $form->type = '';
+ $form->type = '';
}
if (!isset($form->intro)) {
- $form->intro = '';
+ $form->intro = '';
}
if (!isset($form->descrption)) {
- $form->descrption = '';
+ $form->descrption = '';
}
if (!isset($form->section)) {
$form->section = '';
}
-if (empty($form->timeopen)) {
- $form->timeopen = "";
- $form->timerestrict = 0;
-} else {
- $form->timerestrict = 1;
-}
-
-//get the number of the section
-if ($update!=false) { // update instance
-
-}
-else
-{
- $sectionId = optional_param('section', 0, PARAM_INT);
-}
-
-
$event=false;
$description="";
+$stringDate="";
//check if a calendar event exist
-if($update!=false){ //update
+if(isset($update)){ //update
//get the information of the activity
if (! $cmVT = get_record("course_modules", "id", $update)) {
return false;
}
$activity = get_record("voicetools", "id", $cmVT->instance );
+
$sectionId=$activity->section;
$action = "update";
- $id=$cmVT->course;
+ $id=$cmVT->course;//get the id of the course
- $event=voicetools_get_event_calendar($activity->id) ;
+ $event=liveclassroom_get_event_calendar($activity->id);
- if(empty($event) || $event==false)//no event
+ if($event==true)//no event
{
- $checked= "";
- if($course->format == "social" || $course->format == "topics" || $sectionId != 0){
- $disableAllElements="disabled";
- $disabledCheckbox="";
- }else{
- $disabledCheckbox="disabled";
- $disableAllElements="disabled";
- }
-
- }
- else
- {//there is a event
$checked ="checked";
- if($course->format == "social" || $course->format == "topics" || $sectionId != 0){
- $disabledCheckbox="";
- $disableAllElements="";
- }
- else
- {
- $disabledCheckbox="disabled";
- $disableAllElements="disabled";
- }
list($description,$link)=split("<br>",$event->description);
- }
- $name="";
- if(isset($action) && $action=="update") {
- $completeName=explode(" - ", $activity->name);
- $name=$completeName[1];
+ $stringDate=date('m',$event->timestart)."/".date('d',$event->timestart)."/".date('Y',$event->timestart);
+
}
-
-
+ $name= $activity->name; //get the name
}
else
{//new
$checked ="checked";
- if($course->format == "social" || $course->format == "topics" || $sectionId != 0){
- $disabledCheckbox="";
- $disableAllElements="";
- }
- else
- {
- $disabledCheckbox="disabled";
- $disableAllElements="disabled";
- }
+
$name="";
}
-
-$weekdate = $course->startdate; // this should be 0:00 Monday of that week
-$weekdate += 7200; // Add two hours to avoid possible DST problems
- $section = 0;
-// $sectionmenu = array();
-$weekofseconds = 604800;
-$course->enddate = $course->startdate + ($weekofseconds * $course->numsections);
-$list_weeks[0]= "Introduction section"; //For first section
-$k=1;
-while ($weekdate < $course->enddate) {
- $nextweekdate = $weekdate + ($weekofseconds);
- $weekday = userdate($weekdate, '%d %b') ;
- $endweekday = userdate($weekdate+518400, '%d %b');
- $list_weeks[$k] = $weekday.' - '.$endweekday;
- $k++;
- $section++;
- $weekdate = $nextweekdate;
-}
-
-$stringDate="";
-if($course->format == "topics" || $course->format == "social"){
-
+//manage the state of the calendar form
+//it is disabled for the Introduction section (week 0) of a weekly course
+if($course->format == "week" && $sectionId != 0){
+ $disabledCheckbox="disabled";
+ $disableAllElements="disabled";
+ $eventDate=mktime(0,0,0,1,date('z',$course->startdate)+($sectionId-1)*7+1,date('y',$course->startdate)) ;
+ $stringDate=date('m',$eventDate)."/".date('d',$eventDate)."/".date('Y',$eventDate);
}
-else if(isset($event) && $event!=false)
+else
{
- $stringDate=date('m',$event->timestart)."/".date('d',$event->timestart)."/".date('Y',$event->timestart);
-}
-else if($sectionId != 0)
-{
- $eventDate=mktime(0,0,0,1,date('z',$course->startdate)+($sectionId-1)*7+1,date('y',$course->startdate)) ;
- $stringDate=date('m',$eventDate)."/".date('d',$eventDate)."/".date('Y',$eventDate);
-}
+ $disabledCheckbox="";
+ $disableAllElements="";
+}
+
// Visible to students or not
if ($form->coursemodule) {
@@ -204,222 +133,35 @@
if ($hiddensection) {
$visible = false;
}
-
-
?>
+<link rel="STYLESHEET" href="<?php p($CFG->wwwroot) ?>/mod/liveclassroom/css/StyleSheet.css"" type="text/css" />
<style>
-#headerBar table
-{
- width: 700px;
- background:white url( "<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/backgrounds/headerbar.png" ) repeat-x bottom left;
-
- height: 32px;
- border-bottom: solid 1px Black;
+body{
+ font-size:14px;
}
-
-
-/*contextBar*/
-#contextBar table
-{
- background-image: url( "<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/backgrounds/toolbar.png" );
- height: 30px;
- width: 700px;
- border-bottom: solid 1px #C7D3E1;
-}
-
-
-.contextBarRight
-{
- padding-left:10px;
- font-family: Verdana;
-
- font-size: 12px;
-}
-
-.roomNameForSettings
-{
- font-family: Verdana;
- font-weight: bold;
- font-size: 12px;
-}
-
-.fontCurrent
-{
- font-family:Verdana;
- font-size:10px;
-
-}
-.nameElement {
- font-family: Verdana;
- font-weight: bold;
- font-size: 12px;
-}
-.nameTools {
- font-family: Verdana;
-
- font-size: 12px;
-}
-
.content
{
- margin:-5px;
+ margin:-5px;
}
-a.list
-{
-
- font-family:Verdana;
- font-size:10px;
- color : #0000FF ;
- text-decoration : underline ;
+div.Table_01 {
+ position:absolute;
+ left:0px;
+ top:0px;
+ width:350px;
+ height:150px;
+ z-index: 50;
+ font-family:Verdana;
+ padding: 2px;
+ margin: 2px;
+ left: 40%;
+ top: 30%;
+ font-size:9px;
+ display:none;
+
+
}
-a.list:hover
-{
- color : #0000FF ;
- text-decoration : none ;
-}
-a.list:visited
-{
- color : #0000FF ;
- text-decoration : underline ;
-}
-a.list:active
-{
- color : #0000FF ;
- text-decoration : none ;
-}
-
-.opac
-{
- width: 100%;
- z-index:5;
- filter:alpha(opacity=33);-moz-opacity:.33;opacity:.33;
-
- height:100%;
- left: 0px;
- top: 0px;
- position:absolute;
- background-color:black;
- display:none;
-
-
-
-}
-.opac iframe
-{
-display:none;/*sorry for IE5*/
-display/**/:block;/*sorry for IE5*/
-position:absolute;/*must have*/
-top:0;/*must have*/
-left:0;/*must have*/
-z-index:5;/*must have*/
-filter:mask();/*must have*/
-width: 100%;/*must have for any big value*/
-height: 100%;/*must have for any big value*/;
-}
-
-
-
-div.Table_01 {
- position:absolute;
- left:0px;
- top:0px;
- width:350px;
- height:150px;
- z-index: 50;
- font-family:Verdana;
- padding: 2px;
- margin: 2px;
- left: 40%;
- top: 30%;
- font-size:9px;
- display:none;
-
-
-}
-
-div.window-left {
- position:absolute;
- left:0px;
- top:0px;
- width:10px;
- height:150px;
- background-image: url( "<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/items/window-left.png" );
- background-repeat:none;
-}
-
-div.window-middle {
- position:absolute;
- left:10px;
- top:0px;
- width:330px;
- height:150px;
- background-image: url( "<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/items/window-middle.png" );
-
-}
-
-div.window-right {
- position:absolute;
- left:340px;
- top:0px;
- width:10px;
- height:150px;
- background-image: url( "<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/items/window-right.png" );
- background-repeat:none;
-}
-
-.popupText
-{
- font-size:12px;
-
- font-family: helvetica;
-}
-
-.popupTitle
-{
- font-size:14px;
- font-weight:bold;
- text-decoration:underline;
- font-family: helvetica;
-}
-.label_settings
-{
-
- text-align:right;
-}
-.page_title
-{
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-size:18px;
-font-weight:bold;
-color:#3c4b5b;
-vertical-align: middle;
-}
-td.action, input.action
-{
- background-image: url("<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/buttons/general-empty.png");
- background-repeat: no-repeat;
-
- background-position: center;
- text-decoration: none;
- color: Black;
- text-align: center;
- cursor: pointer;
- width:75px;
-}
-td.action:hover, input.action:hover
-{
- background-image: url("<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/buttons/general-empty-over.png");
-}
-
-.action label
-{
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size:12px;
- cursor: pointer;
-}
-
</style>
<script type="text/javascript">
@@ -476,7 +218,9 @@
<?php
$listTools = voicetools_get_voicetools_list($course->id);
if($listTools==NULL) { //no voice tools available
- ?>
+ ?>
+
+
document.getElementById("hiddenDiv").style.height=document.documentElement.clientHeight
document.getElementById("hiddenDiv").style.width=document.documentElement.clientWidth
document.getElementById("popup").style.display="block";
@@ -484,6 +228,7 @@
<?php
}
?>
+
}
function popupCancel(){
@@ -732,16 +477,7 @@
<td align="left">
<select name="section" id="section" onchange="change()">
<?php
- for($l=0;$l<sizeof($list_weeks);$l++){
- if($sectionId==$l)
- {
- echo '<OPTION selected value='.$l.'>'."Week ".$l." : ".$list_weeks[$l].'</OPTION>';
- }
- else
- {
- echo '<OPTION value='.$l.'>'."Week ".$l." : ".$list_weeks[$l].'</OPTION>';
- }
- }
+ echo getListOfWeeks($course,$sectionId);
?>
</select>
</td>
@@ -757,32 +493,7 @@
<td colspan="2" align="left">
<select name="section" id="section">
<?php
- $section = 0;
- while ($section <= $course->numsections) {
- if (!$thissection = get_record('course_sections', 'course',$course->id, 'section', $section)) {
- notify('Error getting course_sections!');
- }
- $desc = format_text($thissection->summary, FORMAT_MOODLE, NULL, $course->id);
- $descTxt = txt($desc);
- $minidesc = substr($descTxt, 0, 20);
-
- if ( ($thissection->summary != NULL) && (strlen($descTxt)>20) ) {
- $minidesc .= "...";
- }
- else if ($thissection->summary == NULL){
- $minidesc = "Topic";
- }
- if($sectionId==$section)
- {
- echo '<OPTION selected value='.$section.'>'.$section.". ".$minidesc.'</OPTION>';
- }
- else
-
- {
- echo '<OPTION value='.$section.'>'.$section.". ".$minidesc.'</OPTION>';
- }
- $section++;
- }
+ echo getListOfTopics($course,$sectionId);
?>
</select>
</td>
Modified: branches/team/Thomas/moodle/mod/voicetools/version.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/version.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/version.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -33,7 +33,7 @@
/// This fragment is called by moodle_needs_upgrading() and /admin/index.php
/////////////////////////////////////////////////////////////////////////////////
-$module->version = 2006041500; // The current module version (Date: YYYYMMDDXX)
+$module->version = 2009010100; // The current module version (Date: YYYYMMDDXX)
$module->cron = 0; // Period for cron to check this module (secs)
?>
Modified: branches/team/Thomas/moodle/mod/voicetools/view.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/view.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/view.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -32,10 +32,12 @@
/// (Replace voicedirect with the name of your module)
error_reporting(E_ERROR^E_NOTICE);
require_once('../../config.php');
-require_once('lib.php');
-require_once('lib/vt/WimbaVoicetools.php');
-require_once('lib/vt/WimbaVoicetoolsAPI.php');
-require_once('lib/common/WimbaCommons.php');
+require_once('lib.php');
+
+require_once ("lib/php/common/WimbaLib.php");
+require_once('lib/php/vt/WimbaVoicetools.php');
+require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
+require_once('lib/php/common/WimbaCommons.php');
global $CFG;
$id = optional_param('id', 0, PARAM_INT); // Course Module ID, or
Modified: branches/team/Thomas/moodle/mod/voicetools/voicerecorder.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/voicerecorder.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/voicerecorder.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -33,15 +33,15 @@
<head id="Head1">
<title>Recorder</title>
-<script language="javascript" src="js/dojo/dojo.js"></script>
-<script language="javascript" src="js/ajax.js"></script>
-<script language="javascript" src="js/constants.js"></script>
-<script language="javascript" src="js/pngfix.js"></script>
+<script language="javascript" src="lib/web/js/dojo/dojo.js"></script>
+<script language="javascript" src="lib/web/js/ajax.js"></script>
+<script language="javascript" src="lib/web/js/constants.js"></script>
+<script language="javascript" src="lib/web/js/pngfix.js"></script>
<link rel="STYLESHEET" href="css/StyleSheet.css" type="text/css" />
- <script language="javascript" src="js/xmldom.js"></script>
+ <script language="javascript" src="lib/web/js/xmldom.js"></script>
@@ -52,8 +52,8 @@
require_once("../../config.php");
require_once("lib.php");
- require_once('lib/vt/WimbaVoicetools.php');
- require_once('lib/vt/WimbaVoicetoolsAPI.php');
+ require_once('lib/php/vt/WimbaVoicetools.php');
+ require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
global $CFG;
$vtAction=new vtAction(null);
Modified: branches/team/Thomas/moodle/mod/voicetools/welcome.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/welcome.php 2008-01-17 21:18:29 UTC (rev 228)
+++ branches/team/Thomas/moodle/mod/voicetools/welcome.php 2008-01-18 21:50:05 UTC (rev 229)
@@ -36,18 +36,18 @@
<head>
<title>Voice Tools</title>
<link rel="STYLESHEET" href="css/StyleSheet.css" type="text/css" />
-<script language="javascript" src="js/dojo/dojo.js"></script>
-<script language="javascript" src="js/ajax.js"></script>
-<script language="javascript" src="js/verifForm.js"></script>
-<script language="javascript" src="js/constants.js"></script>
-<script type="text/javascript" src="js/ajaxslt/xslt.js"></script>
-<script type="text/javascript" src="js/pngfix.js"></script>
-<script src="js/ajaxslt/util.js" type="text/javascript"></script>
-<script src="js/ajaxslt/xmltoken.js" type="text/javascript"></script>
-<script src="js/ajaxslt/dom.js" type="text/javascript"></script>
-<script src="js/ajaxslt/xpath.js" type="text/javascript"></script>
-<script src="js/hwCommons.js" type="text/javascript"></script>
- <script src="js/xmldom.js" type="text/javascript"></script>
+<script language="javascript" src="lib/web/js/dojo/dojo.js"></script>
+<script language="javascript" src="lib/web/js/ajax.js"></script>
+<script language="javascript" src="lib/web/js/verifForm.js"></script>
+<script language="javascript" src="lib/web/js/constants.js"></script>
+<script type="text/javascript" src="lib/web/js/ajaxslt/xslt.js"></script>
+<script type="text/javascript" src="lib/web/js/pngfix.js"></script>
+<script src="lib/web/js/ajaxslt/util.js" type="text/javascript"></script>
+<script src="lib/web/js/ajaxslt/xmltoken.js" type="text/javascript"></script>
+<script src="lib/web/js/ajaxslt/dom.js" type="text/javascript"></script>
+<script src="lib/web/js/ajaxslt/xpath.js" type="text/javascript"></script>
+<script src="lib/web/js/hwCommons.js" type="text/javascript"></script>
+ <script src="lib/web/js/xmldom.js" type="text/javascript"></script>
<script type="text/javascript">
@@ -66,7 +66,7 @@
display+= "<td width='130'></td>";
return display;
}
-
+initPath('lib/web/js/xsl/wimba.xsl','lib/web/pictures');
</script>
<?php
if(isset($_GET["createWorkflow"]) && $_GET["type"]!=""){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tro...@us...> - 2008-01-22 22:59:39
|
Revision: 230
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=230&view=rev
Author: trollinger
Date: 2008-01-22 14:59:37 -0800 (Tue, 22 Jan 2008)
Log Message:
-----------
Update lib and pictures path into differents files
Modified Paths:
--------------
branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css
branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php
branches/team/Thomas/moodle/mod/voicetools/index.php
branches/team/Thomas/moodle/mod/voicetools/manageAction.php
branches/team/Thomas/moodle/mod/voicetools/mod.html
branches/team/Thomas/moodle/mod/voicetools/view.php
branches/team/Thomas/moodle/mod/voicetools/welcome.php
Modified: branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css 2008-01-18 21:50:05 UTC (rev 229)
+++ branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css 2008-01-22 22:59:37 UTC (rev 230)
@@ -126,7 +126,7 @@
height: 32px;
border-bottom: solid 1px Black;
- background:white url( "../pictures/backgrounds/headerbar.png" ) repeat-x bottom left;
+ background:white url( "../lib/web/pictures/backgrounds/headerbar.png" ) repeat-x bottom left;
}
.headerBarRight
@@ -141,7 +141,7 @@
/*contextBar*/
#contextBar table
{
- background-image: url( "../pictures/backgrounds/toolbar.png" );
+ background-image: url( "../lib/web/pictures/backgrounds/toolbar.png" );
height: 30px;
width: 100%;
border-bottom: solid 1px #F0F0F0;
@@ -167,7 +167,7 @@
#filterBar
{
- background-image: url( "../pictures/backgrounds/filterbar.png" );
+ background-image: url( "../lib/web/pictures/backgrounds/filterbar.png" );
height: 24px;
font-weight: bold;
border-bottom: fine 1px #C7D3E1;
@@ -200,22 +200,22 @@
a.filterenabled span
{
- background:url("../pictures/items/filter-enabled-right.png") no-repeat right top;
+ background:url("../lib/web/pictures/items/filter-enabled-right.png") no-repeat right top;
color:white;
}
a.filterenabled
{
- background:url("../pictures/items/filter-enabled-left.png") no-repeat left top;
+ background:url("../lib/web/pictures/items/filter-enabled-left.png") no-repeat left top;
}
a.filterrollover
{
- background:url("../pictures/items/filter-rollover-left.png") no-repeat left top;
+ background:url("../lib/web/pictures/items/filter-rollover-left.png") no-repeat left top;
}
a.filterrollover span
{
- background:url("../pictures/items/filter-rollover-right.png") no-repeat right top;
+ background:url("../lib/web/pictures/items/filter-rollover-right.png") no-repeat right top;
}
/*list*/
@@ -403,7 +403,7 @@
padding-left: 5px;
width: 100%;
height:40px;
- background-image: url( "../pictures/backgrounds/toolbar.png" );
+ background-image: url( "../lib/web/pictures/backgrounds/toolbar.png" );
border-bottom: solid 1px #999999;
}
@@ -459,12 +459,12 @@
/*tabs*/
#tabs
{
- background-image: url( "../pictures/backgrounds/toolbar.png" );
+ background-image: url( "../lib/web/pictures/backgrounds/toolbar.png" );
}
td.tabSelected,td.tabDisabled,td.tabNoSelected
{
- background-image: url(../pictures/items/tab-selected.gif);
+ background-image: url(../lib/web/pictures/items/tab-selected.gif);
background-repeat: no-repeat;
width: 78px;
font-size: 10px;
@@ -476,12 +476,12 @@
{
color: #CACACA;
z-index:-14;
- background-image: url(../pictures/items/tab-unselected.gif);
+ background-image: url(../lib/web/pictures/items/tab-unselected.gif);
border-bottom: solid 1px #818181;
}
td.tabNoSelected
{
- background-image: url(../pictures/items/tab-unselected.gif);
+ background-image: url(../lib/web/pictures/items/tab-unselected.gif);
border-bottom: solid 1px #818181;
}
@@ -563,7 +563,7 @@
td.action, input.action
{
- background-image: url(../pictures/buttons/general-empty.png);
+ background-image: url(../lib/web/pictures/buttons/general-empty.png);
background-repeat: no-repeat;
background-position: center;
text-decoration: none;
@@ -574,7 +574,7 @@
}
td.action:hover, input.action:hover
{
- background-image: url(../pictures/buttons/general-empty-over.png);
+ background-image: url(../lib/web/pictures/buttons/general-empty-over.png);
}
.action label
@@ -724,7 +724,7 @@
top:0px;
width:10px;
height:150px;
- background-image: url( "../pictures/items/window-left.png" );
+ background-image: url( "../lib/web/pictures/items/window-left.png" );
background-repeat:none;
}
@@ -734,7 +734,7 @@
top:0px;
width:330px;
height:150px;
- background-image: url( "../pictures/items/window-middle.png" );
+ background-image: url( "../lib/web/pictures/items/window-middle.png" );
}
@@ -754,7 +754,7 @@
top:0px;
width:10px;
height:200px;
- background-image: url( "../pictures/items/window200_left.png" );
+ background-image: url( "../lib/web/pictures/items/window200_left.png" );
background-repeat:none;
}
@@ -764,7 +764,7 @@
top:0px;
width:380px;
height:200px;
- background-image: url( "../pictures/items/window200_middle.png" );
+ background-image: url( "../lib/web/pictures/items/window200_middle.png" );
}
@@ -774,7 +774,7 @@
top:0px;
width:10px;
height:200px;
- background-image: url( "../pictures/items/window200_right.png" );
+ background-image: url( "../lib/web/pictures/items/window200_right.png" );
background-repeat:none;
}
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-01-18 21:50:05 UTC (rev 229)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-01-22 22:59:37 UTC (rev 230)
@@ -29,52 +29,35 @@
/* $Id: getXmlChoicePage.php 52853 2007-08-24 17:55:26Z thomasr $ */
error_reporting(E_ERROR);
-
+global $CFG;
require_once("../../config.php");
-// require_once("lib.php");
+require_once("lib.php");
require_once("lib/php/common/WimbaXml.php");
require_once("lib/php/common/WimbaCommons.php");
+require_once("lib/php/common/WimbaLib.php");
if (version_compare(PHP_VERSION,'5','>=')) {
require_once('lib/php/common/domxml-php4-php5.php');
}
-
-// Variables needed
-global $CFG;
-
-$params = array ();
-if (!empty ($_POST) ) {
- while (list ($key, $val) = each($_POST)) {
- $params[$key] = $val;
- }
-
+$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
+foreach(getKeysOfGeneralParameters() as $param){
+ $value=optional_param($param["value"],$param["default_value"],$param["type"]);
+ if($value!=null)
+ $params[$param["value"]] = $value;
}
-if (!empty ($_GET) ) {
- while (list ($key, $val) = each($_GET)) {
- $params[$key] = $val;
- }
-
-}
+require_login($params["enc_course_id"]);
$xml=new WimbaXml();
$session=new WimbaMoodleSession($params);
-if($session->error==false)
-{
- if(isset($params["createWorkflow"]) )
- $createWorkflow= $params["createWorkflow"];
- else
- $createWorkflow=false;
-
-
-
-
+if($session->error==false)//no error
+{
/********
HEADER
*********/
- $xml->addHeaderElement("pictures/items/headerbar-logo.png", "true", "true");
+ $xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "true", "true");
/********
SESSION
*********/
- $xml->CreateInformationElement($session->timeOfLoad,$session->hparams["firstname"],$session->hparams["lastname"],$session->hparams["email"],$session->hparams["role"],$session->hparams["courseId"],$session->signature,"","",$CFG->voicetools_servername,$pictures);
+ $xml->CreateInformationElement($session->timeOfLoad,$session->hparams["firstname"],$session->hparams["lastname"],$session->hparams["email"],$session->hparams["role"],$session->hparams["course_id"],$session->signature,"","",$CFG->voicetools_servername);
/************
INFORMATIONS
@@ -84,10 +67,10 @@
/***************
PRODUCTS CHOICE
****************/
- $xml->addProductChoice("pictures/buttons/new-createvoiceboard.png",get_string('new_board', 'voicetools'),get_string('VoiceBoardDescription', 'voicetools'),"javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','board','all','".$createWorkflow."')");
+ $xml->addProductChoice("lib/web/pictures/buttons/new-createvoiceboard.png",get_string('new_board', 'voicetools'),get_string('VoiceBoardDescription', 'voicetools'),"javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','board','all','".$createWorkflow."')");
- $xml->addProductChoice("pictures/buttons/new-createvoicepresentation.png",get_string('new_presentation', 'voicetools'),get_string('VoicePresentationDescription', 'voicetools'),"javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','presentation','all','".$createWorkflow."')");
- $xml->addProductChoice("pictures/buttons/new-createpodcaster.png",get_string('new_podcaster', 'voicetools'),get_string('PodcasterDescription', 'voicetools'),"javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','pc','all','".$createWorkflow."')");//for 3.1
+ $xml->addProductChoice("lib/web/pictures/buttons/new-createvoicepresentation.png",get_string('new_presentation', 'voicetools'),get_string('VoicePresentationDescription', 'voicetools'),"javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','presentation','all','".$createWorkflow."')");
+ $xml->addProductChoice("lib/web/pictures/buttons/new-createpodcaster.png",get_string('new_podcaster', 'voicetools'),get_string('PodcasterDescription', 'voicetools'),"javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','pc','all','".$createWorkflow."')");//for 3.1
/***************
VALIDATION BAR
@@ -100,15 +83,8 @@
$xml->createValidationButtonElement(get_string("validationElement_cancel", "voicetools"), "action", "javascript:launchAjaxRequest('getXmlListPanel.php','',true,'all')", "setting_Cancel");
-
- }else{ //bad session
-
- if($session->error=="session")
- $xml->setError(get_string ('session', 'voicetools'));
- else if($session->error=="signature")
- $xml->setError(get_string ('signature', 'voicetools'));
- echo $xml->getXml();
- exit();
- }
- echo $xml->getXml();
+}else{ //bad session
+ $xml->setError(get_string ($session->error, 'voicetools'));
+}
+echo $xml->getXml();
?>
\ No newline at end of file
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-01-18 21:50:05 UTC (rev 229)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-01-22 22:59:37 UTC (rev 230)
@@ -31,41 +31,32 @@
/// This page generates the xml of the principal window
error_reporting(E_ERROR);
+global $CFG;
+
require_once("../../config.php");
require_once("lib.php");
-
require_once("lib/php/common/WimbaXml.php");
require_once("lib/php/common/WimbaCommons.php");
require_once("lib/php/common/WimbaUI.php");
require_once("lib/php/common/XmlResource.php");
require_once('lib/php/vt/WimbaVoicetools.php');
require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
+require_once('lib/php/common/WimbaLib.php');
-
-set_time_limit(30);
-
-
-// Variables needed
-global $CFG;
-
-$params = array ();
-if (!empty ($_POST) ) {
- while (list ($key, $val) = each($_POST)) {
- $params[$key] = $val;
- }
-
+if (version_compare(PHP_VERSION,'5','>=')) {
+ require_once('lib/php/common/domxml-php4-php5.php');
}
-if (!empty ($_GET) ) {
- while (list ($key, $val) = each($_GET)) {
- $params[$key] = $val;
- }
-
-}
+$messageProduct=optional_param("messageProduct","");
+$messageAction=optional_param("messageAction","");
-if (version_compare(PHP_VERSION,'5','>=')) {
- require_once('lib/common/domxml-php4-php5.php');
+foreach(getKeysOfGeneralParameters() as $param){
+ $value=optional_param($param["value"],$param["default_value"],$param["type"]);
+ if($value!=null)
+ $params[$param["value"]] = $value;
}
+
+require_login($params["enc_course_id"]);
$session=new WimbaMoodleSession($params);
$uiManager=new WimbaUI($session);
if(isset($params["error"])){
@@ -73,26 +64,19 @@
}
else
{
- //Session Management
-
- $message="";
- if(isset($params["messageProduct"]) && isset($params["messageAction"]))
- $message=get_string("message_" . $params["messageProduct"] . "_start", "voicetools")." ".get_string("message_" . $params["messageAction"] . "_end","voicetools");
-
+ //Session Management
if($session->error==false)//good
{
+ $message="";
+ if(!empty($messageProduct) && !empty($messageAction))
+ $message=get_string("message_".$messageProduct."_start", "voicetools")." ".get_string("message_".$messageAction."_end","voicetools");
$display=$uiManager->getVTPrincipalView($message);
}
else
{ //bad session
- if($session->error=="session")
- $display=$uiManager->setError(get_string ('error_session', 'voicetools'));
- else if($session->error=="signature")
- $display=$uiManager->setError(get_string ('error_signature', 'voicetools'));
- echo $display;
- exit();
+ $display="";//to make sure that nothing was displayed before
+ $display=$uiManager->setError(get_string ('error_'.$session->error, 'voicetools'));
}
}
echo $display;
-
- ?>
\ No newline at end of file
+?>
\ No newline at end of file
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php 2008-01-18 21:50:05 UTC (rev 229)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php 2008-01-22 22:59:37 UTC (rev 230)
@@ -40,54 +40,45 @@
require_once("lib/php/common/WimbaCommons.php");
require_once("lib/php/common/WimbaXml.php");
require_once("lib/php/common/WimbaUI.php");
-
-set_time_limit(30);
-
+require_once("lib/php/common/WimbaLib.php");
if (version_compare(PHP_VERSION,'5','>=')) {
require_once('lib/php/common/domxml-php4-php5.php');
}
+set_time_limit(30);
-
-$list_attributes = array ();
-if (!empty ($_POST) ) {
- while (list ($key, $val) = each($_POST)) {
- $list_attributes[$key] = $val;
- }
-
+$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
+foreach(getKeysOfGeneralParameters() as $param){
+ $value=optional_param($param["value"],$param["default_value"],$param["type"]);
+ if($value!=null)
+ $params[$param["value"]] = $value;
}
-if (!empty ($_GET) ) {
- while (list ($key, $val) = each($_GET)) {
- $list_attributes[$key] = $val;
- }
-
-}
-$session=new WimbaMoodleSession($list_attributes);
+
+require_login($params["enc_course_id"]);
+
+$session=new WimbaMoodleSession($params);
$uiManager=new WimbaUI($session);
if($session->error==false)
{
- if(isset($_GET["createWorkflow"]) && $_GET["createWorkflow"]=="true")
- $createWorkflow= "true";
- else
- $createWorkflow="false";
+
/*******************
GET URL INFORMATIONS
********************/
$action = optional_param('action', ""); // Course Module ID, or
- $typeProduct = $list_attributes['type'];
+ $typeProduct = $params['type'];
add_to_log($session->getCourseId(), "voicetools", "xml", "product" , $typeProduct);
if($action == 'update') { //get the information of the resource
- $currentBoard = voicetools_api_get_resource($list_attributes["id"]);
+ $currentBoard = voicetools_api_get_resource($params["resource_id"]);
if($currentBoard==null || $currentBoard->error==true){
$xml->setError(get_string('problem_vt','voicetools'));
echo $xml->getXml();
exit();
}
- $currentBoardInformations=voicetools_get_voiceboard_Informations($list_attributes["id"]);
+ $currentBoardInformations=voicetools_get_voiceboard_Informations($params["resource_id"]);
if($currentBoard->error==true){
$xml->setError(get_string('problem_bd','voicetools'));
echo $xml->getXml();
@@ -111,6 +102,6 @@
}
- echo $display;
- ?>
+echo $display;
+?>
Modified: branches/team/Thomas/moodle/mod/voicetools/index.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/index.php 2008-01-18 21:50:05 UTC (rev 229)
+++ branches/team/Thomas/moodle/mod/voicetools/index.php 2008-01-22 22:59:37 UTC (rev 230)
@@ -29,18 +29,15 @@
/* $Id: index.php 52852 2007-08-24 17:50:59Z thomasr $ */
/// This page lists all the instances of voicetools in a particular course
-
+error_reporting(E_ERROR);
require_once("../../config.php");
require_once("lib.php");
require_once("lib/php/common/WimbaLib.php");
-$id = optional_param('id', 0, PARAM_INT); // course
-$course = optional_param('course', 0, PARAM_INT);
-$type = optional_param('type');
+$course_id = optional_param('id', 0, PARAM_INT); // course
+$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
-
-
-if (! $course = get_record("course", "id", $id)) {
+if (! $course = get_record("course", "id", $course_id)) {
error("Course ID is incorrect");
}
@@ -48,22 +45,15 @@
add_to_log($course->id, "voicetool", "view all", "index.php?id=$course->id", "");
-
-$id = optional_param('id', 0, PARAM_INT);
-if (! $course = get_record("course", "id", $id)) {
- error("Course ID is incorrect");
-}
-require_login($course->id);
$strvoicetools = get_string("modulenameplural", "voicetools");
$strvoicetool = get_string("modulename", "voicetools");
$navigation = array();
- if ($course->id != SITEID) {
+if ($course->id != SITEID) {
$navigation[$course->shortname] = "$CFG->wwwroot/course/view.php?id=$course->id";
}
$navigation[$strvoicetools] = "";
-
$urls = array();
foreach($navigation as $text => $href) {
if (empty($href)) {
@@ -75,45 +65,25 @@
$breadcrumb = implode(' -> ', $urls);
print_header("$course->shortname", "$course->fullname",
-"$breadcrumb",
-"", "", true, "",
-"");
-$url = get_url_params($course->id);
+ "$breadcrumb","", "",true,"","");
+$url_params = get_url_params($course->id);
-if(isset($_GET["createWorkflow"]) && $_GET["createWorkflow"]==true)
- $novoicetools="&createWorkflow=true&type=".$type;
-else
- $novoicetools="";
-?>
+//create the url which all the parameters needed
+$url="welcome.php?id=".$course->id."&".$url_params."&time=".time()."&createWorkflow=".$createWorkflow;
- <head>
-
-
- </head>
-<br>
+?>
+<br>
<body>
-<br>
-
-
-<div align="center">
- <table height="95%">
- <iframe src="welcome.php?id=<?php echo $id; ?>&<?php echo $url; ?>&time=<?php echo time() ?><?php echo $novoicetools ?>" width="705px" height="405px" name="frameWidget" style="overflow:hidden;" FRAMEBORDER=0 align="middle">
- <p>Sorry your navigator can't display this iframe
-
- </iframe>
-</table>
-</div>
-
+ <div align="center">
+ <table height="95%">
+ <iframe src="<?=$url?>" width="705px" height="405px" name="frameWidget" style="overflow:hidden;" FRAMEBORDER=0>
+ <p>Sorry your navigator can't display this iframe
+ </iframe>
+ </table>
+ </div>
</body>
-
-
-
-
-
-
<?php
-/// Finish the page
-
+/// Finish the page
print_footer($course);
?>
Modified: branches/team/Thomas/moodle/mod/voicetools/manageAction.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/manageAction.php 2008-01-18 21:50:05 UTC (rev 229)
+++ branches/team/Thomas/moodle/mod/voicetools/manageAction.php 2008-01-22 22:59:37 UTC (rev 230)
@@ -38,50 +38,38 @@
require_once ("lib/php/common/WimbaCommons.php");
require_once ('lib/php/vt/WimbaVoicetools.php');
require_once ('lib/php/vt/WimbaVoicetoolsAPI.php');
+require_once ('lib/php/vt/VtAction.php');
global $CFG;
-$list_attributes = array ();
-if (!empty ($_POST) ) {
- while (list ($key, $val) = each($_POST)) {
- $list_attributes[$key] = $val;
- }
-
+$messageProduct=optional_param("messageProduct","");
+$messageAction=optional_param("messageAction","");
+$notool=optional_param("novoicetools","false");
+$keys=array_merge(getKeysOfGeneralParameters(),getKeyWimbaVoiceForm());
+foreach($keys as $param){
+ $value=optional_param($param["value"],$param["default_value"],$param["type"]);
+ if($value!=null)
+ $params[$param["value"]] = $value;
}
-if (!empty ($_GET) ) {
- while (list ($key, $val) = each($_GET)) {
- $list_attributes[$key] = $val;
- }
-
-}
+require_login($params["enc_course_id"]);
+$vtAction = new vtAction($params);
-$vtAction = new vtAction($list_attributes);
-
-$session = new WimbaMoodleSession($list_attributes);
-
+$session = new WimbaMoodleSession($params);
$messageType = "";
if ($session->error == false && $session != NULL) {
- if (isset ($list_attributes["novoicetools"]) && $list_attributes["novoicetools"] == "true")
- $notool = "true";
- else
- $notool = "false";
- //if(isteacher($session->getCourseId())) {
- if ($_GET['action'] == 'launch') {
- $session->setCurrentVtUSer($list_attributes["type"]);
- if ($_GET["studentView"] == "true") {
- $session->setVtUserRigths($list_attributes["type"], "student");
+
+ if ($params['action'] == 'launch') {
+ $session->setCurrentVtUSer($params["type"]);
+ if ($params["studentView"] == "true") {
+ $session->setVtUserRigths($params["type"], "student");
}
- $resource = voicetools_api_get_resource($list_attributes["id"]);
-
-
+ $resource = voicetools_api_get_resource($params["resource_id"]);
$result = $vtAction->getVtSession($resource, $session->getVtUser(), $session->getVtUserRigths());
-
-
if ($result != NULL) {
- header('Location:' . $CFG->voicetools_servername . '/' . $list_attributes["type"] . '?action=display_popup&nid=' . $result->getNid());
+ header('Location:' . $CFG->voicetools_servername . '/' . $params["type"] . '?action=display_popup&nid=' . $result->getNid());
}
else {
header('Location: welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad . '&error=problem_vt');
@@ -89,30 +77,30 @@
exit ();
}
- elseif ($list_attributes['action'] == 'create') {
- if ($list_attributes['type'] == "board") {
+ elseif ($params['action'] == 'create') {
+ if ($params['type'] == "board") {
$result = $vtAction->createBoard(); //create the resource on the vt
$messageAction = "created";
$messageProduct = "board";
}
- elseif ($list_attributes['type'] == "presentation") {
+ elseif ($params['type'] == "presentation") {
$result = $vtAction->createPresentation();
$messageAction = "created";
$messageProduct = "presentation";
}
- elseif ($list_attributes['type'] == "pc") {
+ elseif ($params['type'] == "pc") {
$result = $vtAction->createPodcaster();
$messageAction = "created";
$messageProduct = "pc";
}
-
+
if ($result != NULL && $result->error != "error") {
- $resourceId = storeResource($result->getRid(), $session->getCourseId(), $list_attributes['type'],$list_attributes["longname"], $list_attributes);
+ $params["resource_id"] = storeResource($result->getRid(), $session->getCourseId(), $params['type'],$params["longname"], $params);
- if (empty ($resourceId)) {
+ if (empty ($params["resource_id"])) {
error_log(__FUNCTION__ . " : Problem to add the new resource on the database", TRUE);
header('Location: welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad . '&error=problem_bd');
@@ -131,22 +119,22 @@
exit ();
}
}
- elseif ($list_attributes['action'] == 'update') {
- if ($list_attributes['type'] == "board") {
+ elseif ($params['action'] == 'update') {
+ if ($params['type'] == "board") {
- $result = $vtAction->modifyBoard($list_attributes["id"]); //create the resource on the vt
+ $result = $vtAction->modifyBoard($params["resource_id"]); //create the resource on the vt
$messageAction = "updated";
$messageProduct = "board";
}
- elseif ($list_attributes['type'] == "presentation") {
+ elseif ($params['type'] == "presentation") {
- $result = $vtAction->modifyPresentation($list_attributes["id"]);
+ $result = $vtAction->modifyPresentation($params["resource_id"]);
$messageAction = "updated";
$messageProduct = "presentation";
}
- elseif ($list_attributes['type'] == "pc") {
+ elseif ($params['type'] == "pc") {
- $result = $vtAction->modifyPodcaster($list_attributes["id"]);
+ $result = $vtAction->modifyPodcaster($params["resource_id"]);
$messageAction = "updated";
$messageProduct = "pc";
}
@@ -155,9 +143,9 @@
//create the object to store in the db
- $resourceId = updateResource($result->getRid(), $session->getCourseId(), $list_attributes['type'], $list_attributes, $list_attributes["id"]);
+ $params["resource_id"] = updateResource($result->getRid(), $session->getCourseId(), $param['type'], $param, $params["resource_id"]);
- if (empty ($resourceId)) {
+ if (empty ($params["resource_id"])) {
error_log(__FUNCTION__ . " : Problem to update the resource on the database", TRUE);
header('Location: welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad . '&error=problem_bd');
@@ -174,23 +162,23 @@
}
- elseif ($list_attributes['action'] == 'delete') {
+ elseif ($params['action'] == 'delete') {
- $result = $vtAction->deleteRessource($list_attributes["id"]);
+ $result = $vtAction->deleteRessource($params["resource_id"]);
if ($result != NULL && $result->error != "error") { //if no error during the creation
- if (! voicetools_delete_all_instance_of_resource($list_attributes["id"])) {
- notify("Could not delete the activities for the vocietools:". $list_attributes["id"]);
+ if (! voicetools_delete_all_instance_of_resource($params["resource_id"])) {
+ notify("Could not delete the activities for the vocietools:". $params["resource_id"]);
}
- $messageType = 'delete' . $list_attributes["type"];
- $messageAction = "deleted";
+ $messageType = 'delete' . $param["type"];
+ $messageAction = "deleted";
$messageProduct = $_GET["type"];
}
}
- if (isset ($list_attributes["createWorkflow"]) && $list_attributes["createWorkflow"] == "true") {
+ if (isset ($param["createWorkflow"]) && $param["createWorkflow"] == "true") {
if(!isset($result) )
$rid="";
Modified: branches/team/Thomas/moodle/mod/voicetools/mod.html
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-01-18 21:50:05 UTC (rev 229)
+++ branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-01-22 22:59:37 UTC (rev 230)
@@ -294,7 +294,7 @@
if(document.getElementById("description")!=null)
createCookie("description_disabled",document.getElementById("description").disabled);
- location.href = "<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $id;?>&createWorkflow=true&type=";
+ location.href = "<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $id;?>&createWorkflow=true";
}
function hideCalendarEvent(value){
@@ -432,7 +432,7 @@
<table cellspacing="0" cellpadding="0" width=700px align=center>
<tr>
<td class="headerBarLeft" align="left">
- <img alt="" src="<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/items/headerbar-logo.png">
+ <img alt="" src="<?php echo $CFG->wwwroot;?>/mod/voicetools/lib/web/pictures/items/headerbar-logo.png">
</td>
<td align="right" class="headerBarRight">
@@ -503,7 +503,7 @@
<tr valign="top">
<td align="right"><font color="red">*</font><font class="fontCurrent"><?php print_string('voicetoolstype', 'voicetools')?></font></td>
- <td align="left"><select id="resource" name="resource" onclick="javascript:LaunchCreateWorkflowBySelect()">
+ <td align="left"><select id="resource" name="resource">
<option value="empty">
Select...
</option>
@@ -745,7 +745,7 @@
<div align=center width=700px>
<table width=700px cellpadding="5" align=center >
<tr style="border-top:1px solid; background-color:#F0F0F0;">
- <td align="left"><img alt="" src="<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/items/listitem-voicetoolsicon.gif" ><a class="list" href="<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $id;?>">
+ <td align="left"><img alt="" src="<?php echo $CFG->wwwroot;?>/mod/voicetools/lib/web/pictures/items/listitem-voicetoolsicon.gif" ><a class="list" href="<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $id;?>">
<?php print_string('activity_manageTools', 'voicetools')?></a>
</td>
Modified: branches/team/Thomas/moodle/mod/voicetools/view.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/view.php 2008-01-18 21:50:05 UTC (rev 229)
+++ branches/team/Thomas/moodle/mod/voicetools/view.php 2008-01-22 22:59:37 UTC (rev 230)
@@ -30,7 +30,7 @@
/// This page prints a particular instance of voicedirect
/// (Replace voicedirect with the name of your module)
-error_reporting(E_ERROR^E_NOTICE);
+error_reporting(E_ERROR);
require_once('../../config.php');
require_once('lib.php');
@@ -38,7 +38,8 @@
require_once('lib/php/vt/WimbaVoicetools.php');
require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
require_once('lib/php/common/WimbaCommons.php');
-global $CFG;
+require_once('lib/php/vt/vtAction.php');
+
$id = optional_param('id', 0, PARAM_INT); // Course Module ID, or
if ((isset($_GET["action"]) && $_GET["action"]!="launchCalendar" ) && $id || !isset($_GET["action"]) ) {
@@ -71,8 +72,7 @@
add_to_log($course->id, "voicetools", "view", "view.php?id=$cm->id", "$voicetool->id");
$session=new WimbaMoodleSession(NULL);
-
-
+
//check the availability of the resource
$vt_informations=voicetools_get_voicetool_informations($voicetool->rid);
if($vt_informations !=null && $vt_informations->availability=="0"){
@@ -110,6 +110,10 @@
$vtAction=new vtAction(NULL);
$session->setCurrentVtUSer($resource->getType(),$USER->firstname."_".$USER->lastname,$USER->email,$role);
+
+//use a vt user
+
+
$vtSession=$vtAction->getVtSession($resource,$session->getVtUser(),$session->getVtUserRigths()) ;
@@ -157,128 +161,53 @@
}
- function startVoiceBoard(){
- <?
- if(isset($roleSwitch) && $roleSwitch==true) {
- ?>
- result=window.confirm("<?php echo get_string ('launchstudent', 'voicetools');?>");
- if(result==true) {
- doOpenPopup("<?php echo $servername ?>/<? echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
-
- }
- else
- {
- location.href= document.referrer;
- }
-
- <?}else{
-
- ?>
- doOpenPopup("<?php echo $servername ?>/<? echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
-
- <?}?>
- }
+function startVoiceBoard(){
+ <?
+ if(isset($roleSwitch) && $roleSwitch==true) {
+ ?>
+ result=window.confirm("<?php echo get_string ('launchstudent', 'voicetools');?>");
+ if(result==true) {
+ doOpenPopup("<?php echo $servername ?>/<? echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
+
+ }
+ else
+ {
+ location.href= document.referrer;
+ }
+
+ <?}else{
+ ?>
+ doOpenPopup("<?php echo $servername ?>/<? echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
+ <?}?>
+}
</script>
-
+<link rel="STYLESHEET" href="<?php p($CFG->wwwroot) ?>/mod/voicetools/css/StyleSheet.css"" type="text/css" />
<style>
-
-
-a.list
-{
-
- font-family:Verdana;
- font-size:10px;
- color : #0000FF ;
- text-decoration : underline ;
+body{
+ font-size:14px;
}
-a.list:hover
-{
- color : #0000FF ;
- text-decoration : none ;
-}
-a.list:visited
-{
- color : #0000FF ;
- text-decoration : underline ;
-}
-a.list:active
-{
- color : #0000FF ;
- text-decoration : none ;
-}
-/*headerBar*/
-#headerBar table
-{
- width: 100%;
- background:white url( "<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/backgrounds/headerbar.png" ) repeat-x bottom left;
-
- height: 32px;
- border-bottom: solid 1px Black;
-}
-
-
-.headerBarRight
-{
- padding-right:10px;
-}
-.headerBarLeft
-{
- padding-left:10px;
-}
-
-/*contextBar*/
-
-
-#contextBar table
-{
- background-image: url( "<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/backgrounds/toolbar.png" );
- height: 30px;
- width: 100%;
- border-bottom: solid 1px #C7D3E1;
-}
-
-
-.contextBarRight
-{
- margin-left:20px;
- font-family: Verdana;
-
- font-size: 12px;
-}
-.contextBarLeft
-{
- margin-left:20px;
- font-family: Verdana;
- font-weight: bold;
- font-size: 12px;
-}
-
-.roomNameForSettings
-{
- font-family: Verdana;
- font-weight: bold;
- font-size: 12px;
-}
.middle_panel{
height:315px;
-
+
}
html>body .middle_panel{
- height:312px;
-
+ height:312px;
+
}
+
</style>
+
<div style="border:solid 1px #808080;width:700px;height:400px;margin-left:20%;margin-top:5%">
<div class="headerBar" id="headerBar">
<table cellpadding="0" cellspacing="0" width=100%>
<tbody>
<tr>
<td align=left>
- <img src="pictures/items/headerbar-logo.png" height="32" width="80">
+ <img src="lib/web/pictures/items/headerbar-logo.png" height="32" width="80">
</td>
</tr>
</tbody>
@@ -310,18 +239,17 @@
<tr valign=middle align=center>
<td>
<?php if($preview==false){
-
- echo get_string ('activity_tools_not_available', 'voicetools');
-
+ echo get_string ('activity_tools_not_available', 'voicetools');
}else{
- ?>
- <script>
- startVoiceBoard();</script>
- <?php echo get_string ('vtpopupshouldappear.1', 'voicetools');?>
- <a href="javascript:startVoiceBoard ('<?php echo "$CFG->wwwroot/course/view.php?id=$course->id" ?>');">
- <?php echo get_string ('vtpopupshouldappear.2', 'voicetools');?>
- </a>
- <?php echo get_string ('vtpopupshouldappear.3', 'voicetools');?>
+ ?>
+ <script>
+ startVoiceBoard();
+ </script>
+ <?php echo get_string ('vtpopupshouldappear.1', 'voicetools');?>
+ <a href="javascript:startVoiceBoard ('<?php echo "$CFG->wwwroot/course/view.php?id=$course->id" ?>');">
+ <?php echo get_string ('vtpopupshouldappear.2', 'voicetools');?>
+ </a>
+ <?php echo get_string ('vtpopupshouldappear.3', 'voicetools');?>
<?php }?>
</td>
</tr>
@@ -329,27 +257,23 @@
</table>
</div>
<div>
- <table width=100% >
-
- <tr style="border-top:1px solid; background-color:#F0F0F0;">
- <td align=left >
- <img src="<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/items/listitem-voicetoolsicon.gif" /><a class="list" href="<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $cm->course;?>"><?php
- if($role=="Instructor")
- print_string('activity_manageTools', 'voicetools');
- else
- echo "Voice Tools";
-
- ?></a>
-
- </td>
- </td>
-
+ <table width=100% >
+ <tr style="border-top:1px solid; background-color:#F0F0F0;">
+ <td align=left >
+ <img src="<?php echo $CFG->wwwroot;?>/mod/voicetools/lib/web/pictures/items/listitem-voicetoolsicon.gif" />
+ <a class="list" href="<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $cm->course;?>"><?php
+ if($role=="Instructor")
+ print_string('activity_manageTools', 'voicetools');
+ else
+ echo "Voice Tools";
+
+ ?></a>
+ </td>
+ <tr>
</table>
</div>
-</div>
-
-
- <?php
+</div>
+<?php
/// Finish the page
print_footer($course);
?>
Modified: branches/team/Thomas/moodle/mod/voicetools/welcome.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/welcome.php 2008-01-18 21:50:05 UTC (rev 229)
+++ branches/team/Thomas/moodle/mod/voicetools/welcome.php 2008-01-22 22:59:37 UTC (rev 230)
@@ -31,6 +31,8 @@
/// This page creates a link between the CMS and the component
error_reporting(E_ERROR);
+require_once("../../config.php");
+require_once("lib.php");
?>
<html>
<head>
@@ -47,9 +49,7 @@
<script src="lib/web/js/ajaxslt/dom.js" type="text/javascript"></script>
<script src="lib/web/js/ajaxslt/xpath.js" type="text/javascript"></script>
<script src="lib/web/js/hwCommons.js" type="text/javascript"></script>
- <script src="lib/web/js/xmldom.js" type="text/javascript"></script>
-
-
+<script src="lib/web/js/xmldom.js" type="text/javascript"></script>
<script type="text/javascript">
function doOpenAddActivity(url,param){
@@ -68,79 +68,57 @@
}
initPath('lib/web/js/xsl/wimba.xsl','lib/web/pictures');
</script>
+</head>
<?php
-if(isset($_GET["createWorkflow"]) && $_GET["type"]!=""){
- $firstPage= "getXmlNewPanel.php";
- $createWorkflow="true";
- ?>
- <script>
- typeSelect="<?php echo $_GET["type"]?>"
- </script>
- <?php
-
-
-}else if(isset($_GET["createWorkflow"]) && $_GET["type"]==""){
- $createWorkflow="true";
- $firstPage= "getXmlChoicePage.php";
+$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
+if($createWorkflow==true)
+{
+ $firstPage= "getXmlChoicePage.php";
}
-else{
- $firstPage="getXmlListPanel.php";
- $createWorkflow="false";
-
+else
+{
+ $firstPage= "getXmlListPanel.php";
}
-
-
-
-?>
-<body id="body" onLoad="javascript:DisplayFirstPage('<?php echo $firstPage ?>','all','','','<?php echo $createWorkflow;?>');" onkeypress="removeEnterKeyPress()">
-
-<div id="all" style="display:block;overflow:hidden;border:solid 1px #808080;width:700px;height:400px;"></div>
-
-<div id="loading" style="display:none;border:solid 1px #808080;width:700px;height:400px">
- <div class="headerBar" id="headerBar">
- <table cellpadding="0" cellspacing="0" width=100%>
- <tbody>
- <tr>
- <td align=left>
- <img src="pictures/items/headerbar-logo.png" height="32" width="80">
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="contextBar" id="contextBar">
- <table>
- <tbody>
- <tr>
- <td></td>
- </tr>
- </tbody>
- </table>
- </div>
- <div >
- <table width=100% style="height:300px">
- <tbody>
- <tr valign=middle>
- <td align=center><img src="pictures/items/wheel.gif"><br>
- <p><font size="-2" face="Verdana" color="666666"> Loading...</font></p>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-
-</div>
-<div class='toolTip' id='Tip'>ToolTip</div>
-
-<div style="display:none" id="pictures" >picture</div>
+?>
+
+<body id="body" onLoad="javascript:DisplayFirstPage('<?php echo $firstPage ?>','all','','','<?php echo $createWorkflow;?>');" onkeypress="removeEnterKeyPress()">
+ <div id="all" style="display:block;overflow:hidden;border:solid 1px #808080;width:700px;height:400px;"></div>
+ <div id="loading" style="display:none;border:solid 1px #808080;width:700px;height:400px">
+ <div class="headerBar" id="headerBar">
+ <table cellpadding="0" cellspacing="0" width=100%>
+ <tbody>
+ <tr>
+ <td align=left>
+ <img src="lib/web/pictures/items/headerbar-logo.png" height="32" width="80">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="contextBar" id="contextBar">
+ <table>
+ <tbody>
+ <tr>
+ <td></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div >
+ <table width=100% style="height:300px">
+ <tbody>
+ <tr valign=middle>
+ <td align=center><img src="lib/web/pictures/items/wheel.gif"><br>
+ <p><font size="-2" face="Verdana" color="666666"> Loading...</font></p>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ </div>
+ <div class='toolTip' id='Tip'>ToolTip</div>
+ <div style="display:none" id="pictures" >picture</div>
</body>
</html>
-
-
-
-<script>
-
-
-
-</script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tro...@us...> - 2008-01-25 22:54:55
|
Revision: 234
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=234&view=rev
Author: trollinger
Date: 2008-01-25 14:54:52 -0800 (Fri, 25 Jan 2008)
Log Message:
-----------
code review and cleaning
Modified Paths:
--------------
branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php
branches/team/Thomas/moodle/mod/voicetools/lib.php
branches/team/Thomas/moodle/mod/voicetools/manageAction.php
branches/team/Thomas/moodle/mod/voicetools/mod.html
branches/team/Thomas/moodle/mod/voicetools/welcome.php
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-01-22 23:54:29 UTC (rev 233)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-01-25 22:54:52 UTC (rev 234)
@@ -28,7 +28,6 @@
******************************************************************************/
/* $Id: getXmlChoicePage.php 52853 2007-08-24 17:55:26Z thomasr $ */
-error_reporting(E_ERROR);
global $CFG;
require_once("../../config.php");
require_once("lib.php");
@@ -45,6 +44,8 @@
$params[$param["value"]] = $value;
}
+ini_set('display_errors','off');
+ini_set('log_errors','on');
require_login($params["enc_course_id"]);
$xml=new WimbaXml();
$session=new WimbaMoodleSession($params);
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-01-22 23:54:29 UTC (rev 233)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-01-25 22:54:52 UTC (rev 234)
@@ -30,9 +30,8 @@
/* $Id: getXmlListPanel.php 52853 2007-08-24 17:55:26Z thomasr $ */
/// This page generates the xml of the principal window
-error_reporting(E_ERROR);
+
global $CFG;
-
require_once("../../config.php");
require_once("lib.php");
require_once("lib/php/common/WimbaXml.php");
@@ -59,8 +58,12 @@
require_login($params["enc_course_id"]);
$session=new WimbaMoodleSession($params);
$uiManager=new WimbaUI($session);
-if(isset($params["error"])){
- $display=$uiManager->setError(get_string ($params["error"], 'voicetools'));
+
+
+
+if(isset($params["error"]) )
+{
+ $uiManager->setError(get_string ($params["error"], 'voicetools'));
}
else
{
@@ -70,13 +73,12 @@
$message="";
if(!empty($messageProduct) && !empty($messageAction))
$message=get_string("message_".$messageProduct."_start", "voicetools")." ".get_string("message_".$messageAction."_end","voicetools");
- $display=$uiManager->getVTPrincipalView($message);
+ $uiManager->getVTPrincipalView($message);
}
else
- { //bad session
- $display="";//to make sure that nothing was displayed before
- $display=$uiManager->setError(get_string ('error_'.$session->error, 'voicetools'));
+ { //bad session
+ $uiManager->setError(get_string ('error_'.$session->error, 'voicetools'));
}
}
-echo $display;
+echo $uiManager->getXmlString();
?>
\ No newline at end of file
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php 2008-01-22 23:54:29 UTC (rev 233)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php 2008-01-25 22:54:52 UTC (rev 234)
@@ -34,7 +34,6 @@
global $CFG;
require_once("../../config.php");
require_once("lib.php");
-
require_once("lib/php/vt/WimbaVoicetoolsAPI.php");
require_once("lib/php/vt/WimbaVoicetools.php");
require_once("lib/php/common/WimbaCommons.php");
@@ -44,64 +43,67 @@
if (version_compare(PHP_VERSION,'5','>=')) {
require_once('lib/php/common/domxml-php4-php5.php');
}
-set_time_limit(30);
$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
-foreach(getKeysOfGeneralParameters() as $param){
+foreach(getKeysOfGeneralParameters() as $param)
+{
$value=optional_param($param["value"],$param["default_value"],$param["type"]);
if($value!=null)
$params[$param["value"]] = $value;
}
require_login($params["enc_course_id"]);
-
$session=new WimbaMoodleSession($params);
$uiManager=new WimbaUI($session);
+
if($session->error==false)
{
-
-
/*******************
GET URL INFORMATIONS
********************/
$action = optional_param('action', ""); // Course Module ID, or
$typeProduct = $params['type'];
-
add_to_log($session->getCourseId(), "voicetools", "xml", "product" , $typeProduct);
- if($action == 'update') { //get the information of the resource
-
+ if($action == 'update')
+ { //get the information of the resource
$currentBoard = voicetools_api_get_resource($params["resource_id"]);
- if($currentBoard==null || $currentBoard->error==true){
- $xml->setError(get_string('problem_vt','voicetools'));
- echo $xml->getXml();
- exit();
+ if($currentBoard==null || $currentBoard->error==true)
+ {
+ $uiManager->setError(get_string('problem_vt','voicetools'));
}
+
$currentBoardInformations=voicetools_get_voiceboard_Informations($params["resource_id"]);
- if($currentBoard->error==true){
- $xml->setError(get_string('problem_bd','voicetools'));
- echo $xml->getXml();
- exit();
+
+ if($currentBoard->error==true)
+ {
+ $uiManager->setError(get_string('problem_bd','voicetools'));
}
+
$uiManager->setCurrentProduct($typeProduct,$currentBoard,$currentBoardInformations);
- }else{
-
+ }
+ else
+ {
+ $uiManager->setCurrentProduct($typeProduct);
+ }
- $uiManager->setCurrentProduct($typeProduct);
- }
$display= $uiManager->getVTSettingsView($action,$createWorkflow);
-
-}else{
+}
+else
+{
if($session->error=="session")
- $xml->setError(get_string ('session', 'voicetools'));
- else if($session->error=="signature")
- $xml->setError(get_string ('signature', 'voicetools'));
-
+ {
+ $uiManager->setError(get_string ('session', 'voicetools'));
+ }
+ else if($session->error=="signature")
+ {
+ $uiManager->setError(get_string ('signature', 'voicetools'));
+ }
}
-echo $display;
+echo $uiManager->getXmlString();
?>
Modified: branches/team/Thomas/moodle/mod/voicetools/lib.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-01-22 23:54:29 UTC (rev 233)
+++ branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-01-25 22:54:52 UTC (rev 234)
@@ -28,7 +28,6 @@
/* $Id: lib.php 56815 2007-12-04 15:08:45Z thomasr $ */
/// Library of functions and constants for module voicetools
-error_reporting(0);
require_once($CFG->libdir.'/datalib.php');
require_once($CFG->dirroot.'/course/lib.php');
require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
@@ -42,38 +41,50 @@
* @param $config - the information from the form mod.html
*/
function voicetools_process_options ($config) {
- global $CFG;
+ global $CFG;
- if(empty($config->servername)){
- error(get_string('wrongconfigurationURLunavailable', 'voicetools'), $_SERVER["HTTP_REFERER"]);
+ /*******
+ we do the following verfication before submitting the configuration
+ -The parameters sent can not be empty
+ -The url of the server can not finish with a /
+ -The url must start with http:// or https://
+ -The api account has to valid
+ ********/
+
+ if(empty($config->servername))
+ {
+ error(get_string('wrongconfigurationURLunavailable', 'voicetools'), $_SERVER["HTTP_REFERER"]);
}
- else if(empty($config->adminusername)){
- error(get_string('emptyAdminUsername', 'voicetools'), $_SERVER["HTTP_REFERER"]);
+
+ if(empty($config->adminusername))
+ {
+ error(get_string('emptyAdminUsername', 'voicetools'), $_SERVER["HTTP_REFERER"]);
}
- else if(empty($config->adminpassword)){
- error(get_string('emptyAdminPassword', 'voicetools'), $_SERVER["HTTP_REFERER"]);
+
+ if(empty($config->adminpassword))
+ {
+ error(get_string('emptyAdminPassword', 'voicetools'), $_SERVER["HTTP_REFERER"]);
}
- $length = strlen($config->servername);
- if ($config->servername{$length-1} == '/') {
- error(get_String('trailingSlash', 'voicetools'), $_SERVER["HTTP_REFERER"]);
- }
- if (!preg_match('/^http:\/\//', $config->servername)) {
- error(get_String('trailingHttp', 'voicetools'), $_SERVER["HTTP_REFERER"]);
- }
- $result = voicetools_api_check_documentbase ($config->servername, $config->adminusername,$config->adminpassword,$CFG->wwwroot);
+
+ if ($config->servername{strlen($config->servername)-1} == '/')
+ {
+ error(get_String('trailingSlash', 'voicetools'), $_SERVER["HTTP_REFERER"]);
+ }
+
+ if (!preg_match('/^http:\/\//', $config->servername) && !preg_match('/^https:\/\//', $config->servername))
+ {
+ error(get_String('trailingHttp', 'voicetools'), $_SERVER["HTTP_REFERER"]);
+ }
+
+ //check if the api account filled is correct and allowed
+ $result = voicetools_api_check_documentbase ($config->servername, $config->adminusername,$config->adminpassword,$CFG->wwwroot);
- if ($result != 'is_allowed.true') {
- if(get_string($result, 'voicetools' )=="[[]]")
- error(get_string($result, 'voicetools' ), 'javascript:history.back();');
+ if ($result != "ok") {
+ if(get_string($result, 'voicetools' ) == "[[]]")//the error description is not in the bundle
+ error($result, 'javascript:history.back();');
else
- error($result, 'javascript:history.back();');
-
+ error(get_string($result, 'voicetools' ), 'javascript:history.back();');
}
- //get the error string and display it
-
-
-
- return;
}
function voicetools_add_instance($voicetool) {
@@ -82,78 +93,142 @@
/// will create a new instance and return the id number
/// of the new instance.
global $USER;
-
+ //get the resource information(type and id)
+ list($rid, $type) = explode(";", $voicetool->resource);
+
$voicetool->timemodified = time();
-list($rid, $type) = explode(";", $voicetool->resource);
-
$voicetool->rid=$rid;
- $name=get_string("$type","voicetools").$voicetool->name;
+ $voicetool->name=get_string("$type","voicetools").$voicetool->name;
+
+ if (!$voicetool->id = insert_record('voicetools', $voicetool)) {
+ return false;
+ }
- $voicetool->name=$name;
- if(!isset($voicetool->section))
- $voicetool->section=0;
- $instanceNumber=insert_record("voicetools", $voicetool);
- if($instanceNumber!=false ){
- add_to_log($voicetool->course, "voicetools", "Add activity", voicetools_send_logs("addInstance","voicetoolsId=".$instanceNumber), "Activity \"".$voicetool->name."\" added");
- }else{
- add_to_log($voicetool->course, "voicetools", "Add activity",voicetools_send_logs("errorAddInstance","voicetoolsId=".$instanceNumber), "Activity \"".$voicetool->name."\" added");
-
-
+ if(isset($voicetool->calendar_event) && $voicetool->calendar_event==true) {
+ voicetools_addCalendarEvent($voicetool);
}
- if($instanceNumber!=false && isset($voicetool->calendar_event) && $voicetool->calendar_event==true) {//no problem
- voicetools_addCalendarEvent($voicetool,$instanceNumber);
-
- }
- return $instanceNumber;
+ return $voicetool->id;
}
+function voicetools_update_instance($voicetool) {
+ /// Given an object containing all the necessary data,
+ /// (defined by the form in mod.html) this function
+ /// will update an existing instance with new data.
+ global $USER;
+
+ //get the course_module instance linked to the liveclassroom instance
+ if (! $cm = get_coursemodule_from_instance("voicetools", $voicetool->id, $voicetool->course)) {
+ error("Course Module ID was incorrect");
+ }
+
+ if($voicetool->section != $cm->section)//the scetion has changed
+ {
+ //Find the right section in the course_section
+ if (!$section = get_record("course_sections", "id", $cm->section)){
+ return false;
+ }
+ //delete in the course section
+ if (! delete_mod_from_section($cm->id, $cm->section)) {
+ return false;
+ }
+
+ //update the course module section
+ if (! $sectionid = add_mod_to_section($voicetool) ) {
+ error("Could not add the new course module to that section");
+ }
+ //update the course modules
+ if (! set_field("course_modules", "section", $sectionid, "id", $cm->id)) {
+ error("Could not update the course module with the correct section");
+ }
+ }
+
+ list($rid, $type) = explode(";", $voicetool->resource);
+ $voicetool->timemodified = time();
+ $voicetool->id = $voicetool->instance;
+ $voicetool->rid=$rid;
+ $voicetool->name=get_string("$type","voicetools").$voicetool->name;
+
+ if (!$voicetool->id = update_record('voicetools', $voicetool)) {
+ return false;
+ }
+ if(isset($voicetool->calendar_event) && $voicetool->calendar_event==true) {//no problem
+ voicetools_addCalendarEvent($voicetool,$voicetool->id );
+ }
+ else
+ {
+ voicetools_deleteCalendarEvent($voicetool->id );
+ }
+
+ return $voicetool->id ;
+}
-function voicetools_addCalendarEvent($informations,$instanceNumber){
- /// Basic event record for the database.
+function voicetools_delete_instance($id) {
+ /// Given an ID of an instance of this module,
+ /// this function will permanently delete the instance
+ /// and any data that depends on it.
+ $result = true;
+ if (! $voicetool = get_record("voicetools", "id", "$id")) {
+ return false;
+ }
+ # Delete any dependent records here #
+ if (! $instanceNumber=delete_records("voicetools", "id", "$voicetool->id")) {
+ add_to_log($voicetool->course, "voicetools", "Delete activity",voicetools_send_logs("errorDeleteInstance","voicetoolsId=".$instanceNumber), "Activity ".$voicetool->name." deletion failed");
+ $result = false;
+ }
+
+ voicetools_deleteCalendarEvent("$voicetool->id");
+ // delete the related calendar event
+
+ return $result;
+}
+
+
+function voicetools_addCalendarEvent($activity_informations){
global $CFG;
+
+ //get some complementary of the resource
+ $resource=get_record('voicetools_resources','rid',$activity_informations->rid);
- $oldEvent=get_record('event','instance',$instanceNumber);
-
- $resource=get_record('voicetools_resources','rid',$informations->rid);
$event = new Object();
- $event->name = $informations->name;
- $event->description = $informations->description."<br><a href=".$CFG->wwwroot."/mod/voicetools/view.php?id=".$instanceNumber."&action=launchCalendar target=_self >".get_string("launch_calendar","voicetools").$resource->type." ...</a>";
-
+ $event->name = $activity_informations->name;
+ $event->description = $activity_informations->description."<br><a href=".$CFG->wwwroot."/mod/voicetools/view.php?id=".$activity_informations->id."&action=launchCalendar target=_self >".get_string("launch_calendar","voicetools").$resource->type." ...</a>";
$event->format = 1;
- $event->userid = 0;
- $event->courseid = $informations->course; //course event
+ $event->userid = 0;
+ $event->courseid = $activity_informations->course; //course event
$event->groupid = 0;
$event->modulename = 'voicetools';
- $event->instance = $instanceNumber;
+ $event->instance = $activity_informations->id;
$event->eventtype = '';
$event->visible = 1;
- if(isset($informations->start_month) && isset($informations->start_year)){//tpics
- $event->timestart = mktime($informations->start_hr,$informations->start_min,0,$informations->start_month,$informations->start_day,$informations->start_year);
- if( $event->timestart < time())
- {
- error(get_string("date_error","voicetools"),$_SERVER["HTTP_REFERER"]);
- }
- }
- else{
- $event->timestart = mktime($informations->start_hr,$informations->start_min,0,date('m',$informations->calendar_start),date('d',$informations->calendar_start),date('Y',$informations->calendar_start));
-
- }
-
+ $event->timemodified = time();
- $duration = $informations->duration_hr*3600 + $informations->duration_min*60;
- if ($duration < 0){
+ if($activity_informations->course_format !="weeks" && $activity_informations->course_format !="weekscss")
+ {//tppics or social
+ $event->timestart = mktime($activity_informations->start_hr,$activity_informations->start_min,0,$activity_informations->start_month,$activity_informations->start_day,$activity_informations->start_year);
+ if( $event->timestart < time())
+ {
+ error(get_string("date_error","voicetools"),$_SERVER["HTTP_REFERER"]);
+ }
+ }
+ else
+ {
+ $event->timestart = mktime($activity_informations->start_hr,$activity_informations->start_min,0,date('m',$activity_informations->calendar_start),date('d',$activity_informations->calendar_start),date('Y',$activity_informations->calendar_start));
+ }
+
+ $duration = $informations->duration_hr*3600 + $informations->duration_min*60;
+ if ($duration < 0)
+ {
$event->timeduration = 0;
}
- else {
+ else
+ {
$event->timeduration = $duration;
}
- $event->timemodified = time();
-
- if(!empty($oldEvent) && $oldEvent!=false) //old event exsit
+ if(!$oldEvent=get_record('event','instance',$activity_informations->id)) //old event exsit
{
$event->id = $oldEvent->id ;
$result=update_record('event', $event);
@@ -165,118 +240,34 @@
return $result;
}
+
function voicetools_deleteCalendarEvent($instanceNumber){
/// Basic event record for the database.
global $CFG;
- $oldEvent=get_record('event','instance',$instanceNumber);
- if(!empty($oldEvent) && $oldEvent!=false){
- $result=delete_records("event", "id", $oldEvent->id);
+ if(!$event=get_record('event','instance',$instanceNumber)){
+ return false;
}
- else
- {
- return false;
- }
- return $result;
-
-}
-
-function voicetools_update_instance($voicetool) {
- /// Given an object containing all the necessary data,
- /// (defined by the form in mod.html) this function
- /// will update an existing instance with new data.
-
- global $USER;
- $voicetool->timemodified = time();
- $voicetool->id = $voicetool->instance;
- if(!isset($voicetool->section))
- $voicetool->section=0;
- // Need to update the section
-
- //get the course_module instance linked to the liveclassroom instance
- if (! $cm = get_coursemodule_from_instance("voicetools", $voicetool->id, $voicetool->course)) {
- error("Course Module ID was incorrect");
- }
+ $result=delete_records("event", "id", $event->id);
+}
- $old_section = $cm->section;
- //Find the right section in the course_section
- $section = get_record("course_sections", "id", $cm->section);
- //delete in the course section
- if (! delete_mod_from_section($cm->id, $cm->section)) {
-
- $result = false;
- //error("Could not delete the $mod->modulename from that section");
- }
- //update the course module section
- if (! $sectionid = add_mod_to_section($voicetool) ) {
- error("Could not add the new course module to that section");
- }
- //update the course modules
- if (! set_field("course_modules", "section", $sectionid, "id", $cm->id)) {
- error("Could not update the course module with the correct section");
- }
-
-
- list($rid, $type) = explode(";", $voicetool->resource);
- $name=get_string("$type","voicetools").$voicetool->name;
- $voicetool->rid=$rid;
- $voicetool->name=$name;
- $instanceNumber=update_record("voicetools", $voicetool);
- if($instanceNumber!=false && isset($voicetool->calendar_event) && $voicetool->calendar_event==true) {//no problem
- voicetools_addCalendarEvent($voicetool,$voicetool->instance);
- } else{
- voicetools_deleteCalendarEvent($voicetool->instance);
-
- }
- add_to_log($voicetool->course, "voicetools", "Update activity",voicetools_send_logs("updateInstance","voicetoolsId=".$instanceNumber), "Activity ".$voicetool->name." has been updated with success");
-
- return $instanceNumber;
-}
-
-
-function voicetools_delete_instance($id) {
+function voicetools_delete_resource($rid) {
/// Given an ID of an instance of this module,
/// this function will permanently delete the instance
/// and any data that depends on it.
- $result = true;
- if (! $voicetool = get_record("voicetools", "id", "$id")) {
-
+ if (! $voicetool = get_record("voicetools_resources", "rid", $rid)) {
return false;
}
-
# Delete any dependent records here #
- if (! $instanceNumber=delete_records("voicetools", "id", "$voicetool->id")) {
- add_to_log($voicetool->course, "voicetools", "Delete activity",voicetools_send_logs("errorDeleteInstance","voicetoolsId=".$instanceNumber), "Activity ".$voicetool->name." deletion failed");
-
- $result = false;
+ if (! delete_records("voicetools_resources", "id", "$voicetool->id")) {
+ return false;
}
- voicetools_deleteCalendarEvent("$voicetool->id");
- // delete the related calendar event
- return $result;
+ return true;
}
-
-function voicetools_delete_resource($id) {
- /// Given an ID of an instance of this module,
- /// this function will permanently delete the instance
- /// and any data that depends on it.
- $result = true;
- if (! $voicetool = get_record("voicetools_resources", "rid", "$id")) {
- return false;
- }
-
- # Delete any dependent records here #
- if (! delete_records("voicetools_resources", "id", "$voicetool->id")) {
- $result = false;
- }
-
-
- return $result;
-}
-
function voicetools_user_outline($course, $user, $mod, $voicetool) {
/// Return a small object with summary information about what a
/// user has done with a given particular instance of this module
@@ -388,42 +379,39 @@
/// Given an ID of an instance of this module,
/// this function will permanently delete the instance
/// and any data that depends on it.
+
+ //delete the resource of the vt list
voicetools_delete_resource($id);
$result = true;
+
if ($voicetools = get_records("voicetools", "rid", $id)) {
-
+
# Delete any dependent records here #
- foreach($voicetools as $voicetool){
-
- //get the course_module instance linked to the liveclassroom instance
- if (! $cm = get_coursemodule_from_instance("voicetools", $voicetool->rid, $voicetool->course)) {
- error("Course Module ID was incorrect");
- }
- if (! delete_course_module($cm->id)) {
- add_to_log($voicetool->course, "voicetools", voicetools_send_logs("errorDeleteAllcm","rid=".$voicetool->id."&cm=".$cm->id), "Delete all activities", "Could not delete the ".$cm->id." (coursemodule)");
- $result = false;
- //Delete a course module and any associated data at the course level (events)
- // notify("Could not delete the $cm->id (coursemodule)");
- }
- if (! delete_records("voicetools_resources", "rid", $voicetool->rid)) {
- add_to_log($liveclassrooms->course, "voicetools", voicetools_send_logs("errorDeleteAlldb","rid=".$voicetool->id), "Delete all activities", "All activities associated to the vocie tools have not been deleted from the voice tools database");
- $result = false;
- }
- if (! delete_records("voicetools", "rid", $voicetool->rid)) {
- add_to_log($liveclassrooms->course, "voicetools", voicetools_send_logs("errorDeleteAlldb","rid=".$voicetool->id), "Delete all activities", "All activities associated to the vocie tools have not been deleted from the voice tools database");
- $result = false;
- }
- //delete in the course section too
- if (! delete_mod_from_section($cm->id, "$cm->section")) {
- add_to_log($voicetool->course, "voicetools", voicetools_send_logs("errorDeleteAllsection","rid=".$voicetool->id."&cm=".$cm->id."§ion=".$cm->section), "Delete all activities", "Could not delete the ".$cm->id." from that section");
- $result = false;
- //notify("Could not delete the $mod->modulename from that section");
- }
+ foreach($voicetools as $voicetool){
+ //get the course_module instance linked to the liveclassroom instance
+ if(! $cm = get_coursemodule_from_instance("voicetools", $voicetool->id, $voicetool->course)) {
+ error("Course Module ID was incorrect");
+ }
+
+ if (! delete_course_module($cm->id)) {
+ add_to_log($voicetool->course, "voicetools", voicetools_send_logs("errorDeleteAllcm","rid=".$voicetool->id."&cm=".$cm->id), "Delete all activities", "Could not delete the ".$cm->id." (coursemodule)");
+ $result = false;
+ //Delete a course module and any associated data at the course level (events)
+ // notify("Could not delete the $cm->id (coursemodule)");
+ }
+ //delete the instance
+ if (! delete_records("voicetools", "id", $voicetool->id)) {
+ add_to_log($liveclassrooms->course, "voicetools", voicetools_send_logs("errorDeleteAlldb","id=".$voicetool->id), "Delete all activities", "All activities associated to the vocie tools have not been deleted from the voice tools database");
+ $result = false;
+ }
+ //delete in the course section too
+ if (! delete_mod_from_section($cm->id, "$cm->section")) {
+ add_to_log($voicetool->course, "voicetools", voicetools_send_logs("errorDeleteAllsection","rid=".$voicetool->id."&cm=".$cm->id."§ion=".$cm->section), "Delete all activities", "Could not delete the ".$cm->id." from that section");
+ $result = false;
+ }
+ }
+ }
- }
- }
-
-
return $result;
}
Modified: branches/team/Thomas/moodle/mod/voicetools/manageAction.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/manageAction.php 2008-01-22 23:54:29 UTC (rev 233)
+++ branches/team/Thomas/moodle/mod/voicetools/manageAction.php 2008-01-25 22:54:52 UTC (rev 234)
@@ -31,7 +31,7 @@
/* $Id: manageRoomAction.php 179 2007-01-11 15:25:54Z hugues $ */
/* This page manage the action create, update, delete for a room */
-error_reporting(E_ERROR);
+global $CFG;
require_once ('../../config.php');
require_once ('lib.php');
require_once ("lib/php/common/WimbaLib.php");
@@ -39,11 +39,15 @@
require_once ('lib/php/vt/WimbaVoicetools.php');
require_once ('lib/php/vt/WimbaVoicetoolsAPI.php');
require_once ('lib/php/vt/VtAction.php');
-global $CFG;
+
+
+
$messageProduct=optional_param("messageProduct","");
$messageAction=optional_param("messageAction","");
$notool=optional_param("novoicetools","false");
+$createWorkflow = optional_param('createWorkflow', $dddddd, PARAM_BOOL); // course
+
$keys=array_merge(getKeysOfGeneralParameters(),getKeyWimbaVoiceForm());
foreach($keys as $param){
$value=optional_param($param["value"],$param["default_value"],$param["type"]);
@@ -54,13 +58,14 @@
require_login($params["enc_course_id"]);
$vtAction = new vtAction($params);
-
$session = new WimbaMoodleSession($params);
-$messageType = "";
-if ($session->error == false && $session != NULL) {
+$redirectionUrl='welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad;
+$urlModuleForm=$CFG->wwwroot.'/course/mod.php?section=0&sesskey='.sesskey().'&id='.$session->getCourseId().'&add=voicetools&rid='.$rid;
+$messageType = "";
+if ($session->error == false && $session != NULL || $CFG->error==true) {
if ($params['action'] == 'launch') {
$session->setCurrentVtUSer($params["type"]);
if ($params["studentView"] == "true") {
@@ -69,105 +74,95 @@
$resource = voicetools_api_get_resource($params["resource_id"]);
$result = $vtAction->getVtSession($resource, $session->getVtUser(), $session->getVtUserRigths());
if ($result != NULL) {
- header('Location:' . $CFG->voicetools_servername . '/' . $params["type"] . '?action=display_popup&nid=' . $result->getNid());
+ redirection($CFG->voicetools_servername . '/' . $params["type"] . '?action=display_popup&nid=' . $result->getNid());
}
else {
- header('Location: welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad . '&error=problem_vt');
+ redirection($redirectionUrl.'&error=problem_vt');
}
- exit ();
-
}
- elseif ($params['action'] == 'create') {
- if ($params['type'] == "board") {
-
+ elseif ($params['action'] == 'create')
+ {
+ if ($params['type'] == "board")
+ {
$result = $vtAction->createBoard(); //create the resource on the vt
$messageAction = "created";
$messageProduct = "board";
}
- elseif ($params['type'] == "presentation") {
-
+ elseif ($params['type'] == "presentation")
+ {
$result = $vtAction->createPresentation();
$messageAction = "created";
$messageProduct = "presentation";
}
- elseif ($params['type'] == "pc") {
-
+ elseif ($params['type'] == "pc")
+ {
$result = $vtAction->createPodcaster();
$messageAction = "created";
$messageProduct = "pc";
}
- if ($result != NULL && $result->error != "error") {
+ if ($result != NULL && $result->error != "error")
+ {
$params["resource_id"] = storeResource($result->getRid(), $session->getCourseId(), $params['type'],$params["longname"], $params);
if (empty ($params["resource_id"])) {
-
error_log(__FUNCTION__ . " : Problem to add the new resource on the database", TRUE);
- header('Location: welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad . '&error=problem_bd');
- exit ();
+ redirection($redirectionUrl. '&error=problem_bd');
}
- // if(VTAPI_DEBUG) {
- error_log(__FUNCTION__ . " : Board Created and added on the database, rid=" . $result->getRid(), TRUE);
- //}
-
-
+ if(VTAPI_DEBUG) {
+ error_log(__FUNCTION__ . " : Board Created and added on the database, rid=" . $result->getRid(), TRUE);
+ }
}
- else {
+ else
+ {
error_log(__FUNCTION__ . " : Problem to add the new resource on the vt server", TRUE);
- header('Location: welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad . '&error=problem_vt');
-
- exit ();
+ redirection($redirectionUrl . '&error=problem_vt');
}
}
- elseif ($params['action'] == 'update') {
- if ($params['type'] == "board") {
-
+ elseif ($params['action'] == 'update')
+ {
+ if ($params['type'] == "board")
+ {
$result = $vtAction->modifyBoard($params["resource_id"]); //create the resource on the vt
$messageAction = "updated";
$messageProduct = "board";
}
- elseif ($params['type'] == "presentation") {
-
+ elseif ($params['type'] == "presentation")
+ {
$result = $vtAction->modifyPresentation($params["resource_id"]);
$messageAction = "updated";
$messageProduct = "presentation";
}
- elseif ($params['type'] == "pc") {
-
+ elseif ($params['type'] == "pc")
+ {
$result = $vtAction->modifyPodcaster($params["resource_id"]);
$messageAction = "updated";
$messageProduct = "pc";
}
- if ($result != NULL) {
-
-
+ if ($result != NULL)
+ {
//create the object to store in the db
$params["resource_id"] = updateResource($result->getRid(), $session->getCourseId(), $param['type'], $param, $params["resource_id"]);
- if (empty ($params["resource_id"])) {
-
+ if (empty ($params["resource_id"]))
+ {
error_log(__FUNCTION__ . " : Problem to update the resource on the database", TRUE);
- header('Location: welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad . '&error=problem_bd');
- exit ();
+ redirection($redirectionUrl . '&error=problem_bd');
}
- $messageType = $_GET['type'] . 'Updated';
+ $messageType = $params['type'] . 'Updated';
}
else {
error_log(__FUNCTION__ . " : Problem to update the resource on the vt server", TRUE);
- header('Location: welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad . '&error=problem_vt');
- exit ();
+ redirection($redirectionUrl . '&error=problem_vt');
}
}
-
- elseif ($params['action'] == 'delete') {
-
+ elseif ($params['action'] == 'delete')
+ {
$result = $vtAction->deleteRessource($params["resource_id"]);
-
if ($result != NULL && $result->error != "error") { //if no error during the creation
-
if (! voicetools_delete_all_instance_of_resource($params["resource_id"])) {
notify("Could not delete the activities for the vocietools:". $params["resource_id"]);
}
@@ -176,26 +171,23 @@
$messageProduct = $_GET["type"];
}
- }
+ }
- if (isset ($param["createWorkflow"]) && $param["createWorkflow"] == "true") {
-
+ if (isset($createWorkflow) && $createWorkflow == true)
+ {
if(!isset($result) )
$rid="";
else
$rid=$result->getRid();
- ?>
- <script>
- parent.location.href="<?php echo $CFG->wwwroot.'/course/mod.php?section=0&sesskey='.sesskey().'&id='.$session->getCourseId().'&add=voicetools&rid='.$rid; ?>"
- </script>
- <?
-
-
+ parentRedirection($urlModuleForm);
}
else
- header('Location: welcome.php?id='.$session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad . '&messageAction=' . $messageAction. '&messageProduct=' .$messageProduct);
+ {
+ redirection($redirectionUrl . '&messageAction=' . $messageAction. '&messageProduct=' .$messageProduct);
+ }
}
-else {
- header('Location: welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad . '&error=session');
+else //bad session
+{
+ redirection($redirectionUrl . '&error=session');
}
?>
\ No newline at end of file
Modified: branches/team/Thomas/moodle/mod/voicetools/mod.html
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-01-22 23:54:29 UTC (rev 233)
+++ branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-01-25 22:54:52 UTC (rev 234)
@@ -29,7 +29,7 @@
******************************************************************************/
/* $Id: mod.html 200 2008-01-09 11:37:50Z trollinger $ */
-error_reporting(E_ERROR);
+
require_once("../config.php");
require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
require_once('lib/php/vt/WimbaVoicetools.php');
@@ -43,10 +43,10 @@
if (!isteacher($course->id, $USER->id)) { //to Be sure
error("You need to be a teacher in this course to create an instance");
}
-
+
//get the required parameters
-$id = optional_param('id', 0, PARAM_INT);
-$roomId = optional_param('roomId',null, PARAM_RAW);
+$course_id = optional_param('id', 0, PARAM_INT);
+$resource_id = optional_param('rid',null, PARAM_RAW);
$update = optional_param('update', null, PARAM_INT);
$sectionId = optional_param('section', null, PARAM_INT);
@@ -66,7 +66,7 @@
if (!isset($form->section)) {
$form->section = '';
}
-
+$error="";
$event=false;
$description="";
$stringDate="";
@@ -77,14 +77,14 @@
if (! $cmVT = get_record("course_modules", "id", $update)) {
return false;
}
- $activity = get_record("voicetools", "id", $cmVT->instance );
- $sectionId=$activity->section;
- $action = "update";
+ $activity = get_record("voicetools", "id", $cmVT->instance );
+ $sectionId=$activity->section;
+
+ $resource_id = $activity->rid;
- $id=$cmVT->course;//get the id of the course
- $event=liveclassroom_get_event_calendar($activity->id);
+ $event=voicetools_get_event_calendar($activity->id);
if($event==true)//no event
{
@@ -98,12 +98,12 @@
else
{//new
$checked ="checked";
-
$name="";
-}
+}
+
//manage the state of the calendar form
//it is disabled for the Introduction section (week 0) of a weekly course
-if($course->format == "week" && $sectionId != 0){
+if($course->format == "weeks" || $course->format == "weekscss" && $sectionId != 0){
$disabledCheckbox="disabled";
$disableAllElements="disabled";
$eventDate=mktime(0,0,0,1,date('z',$course->startdate)+($sectionId-1)*7+1,date('y',$course->startdate)) ;
@@ -114,8 +114,9 @@
$disabledCheckbox="";
$disableAllElements="";
}
-
+
+
// Visible to students or not
if ($form->coursemodule) {
$visible = get_field('course_modules', 'visible', 'id', $form->coursemodule);
@@ -133,6 +134,15 @@
if ($hiddensection) {
$visible = false;
}
+
+//get the list of resource available
+$resourcesRid= voicetools_get_voicetools_list($course->id);
+$vtResources=voicetools_api_get_resources($resourcesRid["rid"]);
+if($vtResources==null)
+{
+ $error=true;
+}
+
?>
<link rel="STYLESHEET" href="<?php p($CFG->wwwroot) ?>/mod/liveclassroom/css/StyleSheet.css"" type="text/css" />
@@ -145,26 +155,9 @@
margin:-5px;
}
-div.Table_01 {
- position:absolute;
- left:0px;
- top:0px;
- width:350px;
- height:150px;
- z-index: 50;
- font-family:Verdana;
- padding: 2px;
- margin: 2px;
- left: 40%;
- top: 30%;
- font-size:9px;
- display:none;
-
-
-}
</style>
-<script type="text/javascript">
-
+
+<script type="text/javascript">
//cookie management
function createCookie(name,value,days) {
if (days) {
@@ -234,13 +227,13 @@
function popupCancel(){
document.getElementById("popup").style.display="none";
document.getElementById("hiddenDiv").style.display="none";
- location.href = "<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php p($id)?>";
+ location.href = "<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php p($course_id)?>";
}
function popupOk(){
document.getElementById("popup").style.display="none";
document.getElementById("hiddenDiv").style.display="none";
- location.href = "<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $id;?>&createWorkflow=true";
+ location.href = "<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $course_id;?>&createWorkflow=true";
}
function LaunchCreateWorkflow(){
@@ -294,12 +287,12 @@
if(document.getElementById("description")!=null)
createCookie("description_disabled",document.getElementById("description").disabled);
- location.href = "<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $id;?>&createWorkflow=true";
+ location.href = "<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $course_id;?>&createWorkflow=true";
}
function hideCalendarEvent(value){
if(value=="check"){
- if( document.getElementById("calendar_event").checked==true)
+ if(document.getElementById("calendar_event").checked==true)
value="";
else
value="disabled";
@@ -409,7 +402,6 @@
deleteCookie("description");
deleteCookie("description_disabled");
}
- change();
}
function loadPage(){
@@ -423,451 +415,401 @@
<title>Wimba</title>
</head>
- <body>
- <div class="content" id=content width=700px align=center>
- <form name="form" id="form" method="post" action="mod.php">
- <input type="hidden" value="" name="type">
+<body>
+ <div class="content" id=content width=700px align=center>
+ <form name="form" id="form" method="post" action="mod.php">
+ <input type="hidden" value="" name="type">
- <div id="headerBar" width=700px align=center>
- <table cellspacing="0" cellpadding="0" width=700px align=center>
+ <div id="headerBar" width=700px align=center>
+ <table cellspacing="0" cellpadding="0" width=700px align=center>
+ <tr>
+ <td class="headerBarLeft" align="left">
+ <img alt="" src="<?php echo $CFG->wwwroot;?>/mod/voicetools/lib/web/pictures/items/headerbar-logo.png">
+ </td>
+ <td align="right" class="headerBarRight">
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="contextBar" width=700px align=center>
+ <table width=700px align=center>
+ <tbody>
<tr>
- <td class="headerBarLeft" align="left">
- <img alt="" src="<?php echo $CFG->wwwroot;?>/mod/voicetools/lib/web/pictures/items/headerbar-logo.png">
- </td>
-
- <td align="right" class="headerBarRight">
+ <td class="contextBarLeft" align="left">
+ <label class= "nameElement"><?php print_string('addactivity', 'voicetools') ?></label>
+ <label class="nameTools">: Voice Tools in <?php echo $course->fullname; ?></label>
</td>
+ <td class="contextBarRight" align="right">Voice Tools</td>
</tr>
- </table>
- </div>
- <div id="contextBar" width=700px align=center>
- <table width=700px align=center>
- <tbody>
- <tr>
- <td class="contextBarLeft" align="left"><label class= "nameElement"><?php print_string('addactivity', 'voicetools') ?></label>
- <label class="nameTools">: Voice Tools in<?php echo $course->fullname; ?></label>
- </td>
-
- <td class="contextBarRight" align="right">Voice Tools</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div id="activity" width="700px" align=center>
- <table border="0" width="700px" align=center cellpadding="5" cellspacing="0">
- <tr valign="top">
- <td align="right">
- <font color="red">*</font> <font class="fontCurrent"><?php print_string('activity_name', 'voicetools') ?></font>
- </td>
- <td align="left">
- <input type="text" id="name" name="name" size="25" value="<?php echo $name ?>">
- </td>
- <td colspan="2">
- <font color="red">*</font><font class="fontCurrent"><?php print_string('required_fields', 'voicetools')?></font>
- </td>
- </tr>
-
- <tr valign="top">
- <?php
- if($course->format == "weeks" || $course->format == "weekscss"){
- ?>
- <td align="right">
- <font class="fontCurrent"><?php print_string('weeksformat', 'voicetools')?></font>
- </td>
- <td align="left">
- <select name="section" id="section" onchange="change()">
- <?php
- echo getListOfWeeks($course,$sectionId);
- ?>
- </select>
- </td>
- </tr>
- <?php
- }else if($course->format == "topics" ){
+ </tbody>
+ </table>
+ </div>
+ <div id="activity" width="700px" align=center>
+ <table border="0" width="700px" align=center cellpadding="5" cellspacing="0">
+ <tr valign="top">
+ <td align="right">
+ <font color="red">*</font> <font class="fontCurrent"><?php print_string('activity_name', 'voicetools') ?></font>
+ </td>
+ <td align="left">
+ <input type="text" id="name" name="name" size="25" value="<?php echo $name ?>">
+ </td>
+ <td colspan="2">
+ <font color="red">*</font><font class="fontCurrent"><?php print_string('required_fields', 'voicetools')?></font>
+ </td>
+ </tr>
+ <?php if($course->format == "weeks" || $course->format == "weekscss"){ ?>
+ <tr valign="top">
+ <td align="right">
+ <font class="fontCurrent"><?php print_string('weeksformat', 'voicetools')?></font>
+ </td>
+ <td align="left">
+ <select name="section" id="section" onchange="change()">
+ <?php
+ echo getListOfWeeks($course,$sectionId);
+ ?>
+ </select>
+ </td>
+ </tr>
+ <?php }else if($course->format == "topics" ){ ?>
+ <tr valign="top">
+ <td align="right">
+ <font class="fontCurrent"><?php print_string('topicformat', 'voicetools') ?></font>
+ </td>
+ <td colspan="2" align="left">
+ <select name="section" id="section">
+ <?php echo getListOfTopics($course,$sectionId); ?>
+ </select>
+ </td>
+ </tr>
+ <?php } ?>
+ <tr valign="top">
+ <td align="right">
+ <font color="red">*</font><?php print_string('voicetoolstype', 'voicetools')?>
+ </td>
- ?>
- <tr valign="top">
- <td align="right">
- <font class="fontCurrent"><?php print_string('topicformat', 'voicetools') ?></font>
- </td>
- <td colspan="2" align="left">
- <select name="section" id="section">
- <?php
- echo getListOfTopics($course,$sectionId);
- ?>
- </select>
- </td>
- </tr>
- <?php } ?>
- </tr>
- <tr valign="top">
- <td align="right"><font color="red">*</font><font class="fontCurrent"><?php print_string('voicetoolstype', 'voicetools')?></font></td>
+ <td align="left"><select id="resource" name="resource">
+ <option value="empty">
+ Select...
+ </option>
+ <optgroup label="<?php echo get_string ('voiceboard', 'voicetools') ?>">
+ <?php
+ for($i=0;$vtResources!=null && $i<count($vtResources->getResources()) ;$i++) {
+ $resource = $vtResources->getResource($i);
+ if($resource->getType()=="board"){
+ if (isset($resource_id) && $resource_id == $resource->getRid())
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ else
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ }
- <td align="left"><select id="resource" name="resource">
- <option value="empty">
- Select...
- </option>
+ }
+ ?>
+ </optgroup>
+ <optgroup label="<?php echo get_string ('voicepresentation', 'voicetools') ?>">
+ <?php
+ for($i=0;$vtResources!=null && $i<count($vtResources->getResources());$i++) {
+ $resource = $vtResources->getResource($i);
+ if($resource->getType()=="presentation"){
- <optgroup label="<?php echo get_string ('voiceboard', 'voicetools') ?>">
- <?php
-
- $resourcesRid= voicetools_get_voicetools_list($course->id);
- $vtResources=voicetools_api_get_resources($resourcesRid["rid"]);
- if($vtResources==null)
- {
- $error=true;
- }
- for($i=0;$vtResources!=null && $i<count($vtResources->getResources()) ;$i++) {
- $resource = $vtResources->getResource($i);
- if($resource->getType()=="board"){
+ if (isset($resource_id) && $resource_id == $resource->getRid())
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ else
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ }
- if (isset($_GET["rid"]) || (isset($action) && $action=="update"))
- {
- if((isset($_GET["rid"]) && $_GET["rid"] == $resource->getRid()) || (isset($activity) && $activity->rid == $resource->getRid()) ) {
- echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- else{
- echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- }
- else
- {
- echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- }
+ }
+ ?>
+ </optgroup>
- }
-
- ?>
- </optgroup>
+ <optgroup label="<?php echo get_string ('podcaster', 'voicetools') ?>">
+ <?php
+ for($i=0;$vtResources!=null && $i<count($vtResources->getResources());$i++) {
+ $resource = $vtResources->getResource($i);
+ if($resource->getType()=="pc"){
- <optgroup label="<?php echo get_string ('voicepresentation', 'voicetools') ?>">
- <?php
- for($i=0;$vtResources!=null && $i<count($vtResources->getResources());$i++) {
- $resource = $vtResources->getResource($i);
- if($resource->getType()=="presentation"){
+ if (isset($resource_id) && $resource_id == $resource->getRid())
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ else
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ }
- if (isset($_GET["rid"]) || (isset($action) && $action=="update"))
- {
- if((isset($_GET["rid"]) && $_GET["rid"] == $resource->getRid()) || (isset($activity) && $activity->rid == $resource->getRid()) ) {
- echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- else{
- echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- }
- else
- {
- echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- }
+ }
+ ?>
+ </optgroup>
+ </select>
+ </td>
- }
- ?>
- </optgroup>
-
- <optgroup label="<?php echo get_string ('podcaster', 'voicetools') ?>">
- <?php
- for($i=0;$vtResources!=null && $i<count($vtResources->getResources());$i++) {
- $resource = $vtResources->getResource($i);
- if($resource->getType()=="pc"){
-
- if (isset($_GET["rid"]) || (isset($action) && $action=="update"))
- {
- if((isset($_GET["rid"]) && $_GET["rid"] == $resource->getRid()) || (isset($activity) && $activity->rid == $resource->getRid()) ) {
- echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- else{
- echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- }
- else
- {
- echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- }
-
- }
- ?>
- </optgroup>
- </select>
- </td>
-
- <td width="50px"><?php print_string('or', 'voicetools')?></td>
- <td>
- <input type="button" value="<?php print_string('new', 'voicetools')?>" onclick="javascript:LaunchCreateWorkflow()">
- </td>
- </tr>
- <tr valign="top" >
- <td align="right">
- <font class="fontCurrent"><?php echo get_string('visibletostudents','voicetools'); ?></font>
- </td>
- <td align="left" >
- <?php
- unset($choices);
- $choices[1] = get_string('show');
- $choices[0] = get_string('hide');
- choose_from_menu($choices, 'visible', $visible, '', '', 0, false, $hiddensection);
- ?>
- </td>
- </tr>
- <tr>
- <td height="30px">
- </td>
- </tr>
- <tr>
- <td align="right" colspan="2" width="500px">
- <div id="calendar">
- <table cellpadding=5 cellspacing="5" width="100%" >
- <tr>
- <td align=right>
- <input type="checkbox" value="true" id="calendar_event" name="calendar_event" onclick=hideCalendarEvent("check") <?php echo $checked." ".$disabledCheckbox ?>>
- <font class="fontCurrent"><?php echo get_string ('add_calendar', 'voicetools') ?></font>
- </td>
- </tr>
-
- <tr>
- <td align=right style="width:200px">
- <?php
- if($course->format == "weeks" || $course->format == "weekscss"){?>
- <select style="float:left" id="start_day" name= "start_day" onchange="change()" <?php echo $disableAllElements ?>>
- <?php
- for($i=0;$i<7;$i++){
- if($event==false && $i==0 || $event!=false && date('w',$event->timestart)==date('w',$i*86400+$course->startdate))
- echo "<option value=".($i*86400)." selected>".get_string("day".date('w',$i*86400+$course->startdate),"voicetools")."</option>";
- else
- echo "<option value=".($i*86400).">".get_string("day".date('w',(($i*86400)+$course->startdate)),"voicetools")."</option>";
- }
- ?>
- </select>
- <label id="comment_date"><?php echo $stringDate;?></label>
-
- <?
- }else if($course->format == "topics" || $course->format == "social" || $course->format == "site"){?>
- <select id="start_month" name="start_month" <?php echo $disableAllElements ?>>
- <?php
- for($i=1;$i<=12;$i++){
- if($event==false && $i==date('m') || $event!=false && date('m',$event->timestart)==$i)
- echo "<option value=".$i." selected>".get_string("month".$i,"voicetools")."</option>";
- else
- echo "<option value=".$i.">".get_string("month".$i,"voicetools")."</option>";
- }
- ?>
- </sel...
[truncated message content] |
|
From: <tro...@us...> - 2008-02-05 22:48:01
|
Revision: 238
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=238&view=rev
Author: trollinger
Date: 2008-02-05 14:47:59 -0800 (Tue, 05 Feb 2008)
Log Message:
-----------
Code cleaning
Modified Paths:
--------------
branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css
branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php
branches/team/Thomas/moodle/mod/voicetools/index.php
branches/team/Thomas/moodle/mod/voicetools/lib.php
branches/team/Thomas/moodle/mod/voicetools/manageAction.php
branches/team/Thomas/moodle/mod/voicetools/manageActionBlock.php
branches/team/Thomas/moodle/mod/voicetools/mod.html
branches/team/Thomas/moodle/mod/voicetools/view.php
branches/team/Thomas/moodle/mod/voicetools/voicerecorder.php
branches/team/Thomas/moodle/mod/voicetools/welcome.php
Modified: branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css 2008-02-05 22:47:38 UTC (rev 237)
+++ branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css 2008-02-05 22:47:59 UTC (rev 238)
@@ -9,11 +9,6 @@
font-size:8px;
}
-*
-{
- margin:0;
- padding:0;
-}
/*general html element*/
input
@@ -144,7 +139,6 @@
background-image: url( "../lib/web/pictures/backgrounds/toolbar.png" );
height: 30px;
width: 100%;
- border-bottom: solid 1px #F0F0F0;
}
.contextBarRight
@@ -278,7 +272,7 @@
.list_archive
{
width:16px;
- border-bottom: solid 1px #F3F3F3;
+ border-bottom: solid 1px #F3F3F3;
}
.list_information
@@ -492,7 +486,6 @@
padding-left:5%;
padding-right:5%;
margin-top:7%;
-
display: block;
height: 247px;
}
@@ -535,7 +528,7 @@
}
*>html .choiceVtonly td {
- height:103px;
+ height:105px;
}
product_choice_left
@@ -586,7 +579,7 @@
/*MessageBar*/
#messageBar
{
- width:99%;
+ width:700px;
}
.message
@@ -596,7 +589,7 @@
bottom:4px;
left:1px;
right:1px;
- height: 20px;
+ height: 25px;
display: block;
}
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-02-05 22:47:38 UTC (rev 237)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-02-05 22:47:59 UTC (rev 238)
@@ -28,64 +28,95 @@
******************************************************************************/
/* $Id: getXmlChoicePage.php 52853 2007-08-24 17:55:26Z thomasr $ */
-global $CFG;
-require_once("../../config.php");
-require_once("lib.php");
-require_once("lib/php/common/WimbaXml.php");
-require_once("lib/php/common/WimbaCommons.php");
-require_once("lib/php/common/WimbaLib.php");
-if (version_compare(PHP_VERSION,'5','>=')) {
- require_once('lib/php/common/domxml-php4-php5.php');
-}
-$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
-foreach(getKeysOfGeneralParameters() as $param){
- $value=optional_param($param["value"],$param["default_value"],$param["type"]);
- if($value!=null)
- $params[$param["value"]] = $value;
-}
-
-ini_set('display_errors','off');
-ini_set('log_errors','on');
-require_login($params["enc_course_id"]);
-$xml=new WimbaXml();
-$session=new WimbaMoodleSession($params);
-if($session->error==false)//no error
-{
- /********
- HEADER
- *********/
- $xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "true", "true");
- /********
- SESSION
- *********/
- $xml->CreateInformationElement($session->timeOfLoad,$session->hparams["firstname"],$session->hparams["lastname"],$session->hparams["email"],$session->hparams["role"],$session->hparams["course_id"],$session->signature,"","",$CFG->voicetools_servername);
-
- /************
- INFORMATIONS
- *************/
- $xml->addContextElement(get_string('new_tool','voicetools'));
-
- /***************
- PRODUCTS CHOICE
- ****************/
- $xml->addProductChoice("lib/web/pictures/buttons/new-createvoiceboard.png",get_string('new_board', 'voicetools'),get_string('VoiceBoardDescription', 'voicetools'),"javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','board','all','".$createWorkflow."')");
-
- $xml->addProductChoice("lib/web/pictures/buttons/new-createvoicepresentation.png",get_string('new_presentation', 'voicetools'),get_string('VoicePresentationDescription', 'voicetools'),"javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','presentation','all','".$createWorkflow."')");
- $xml->addProductChoice("lib/web/pictures/buttons/new-createpodcaster.png",get_string('new_podcaster', 'voicetools'),get_string('PodcasterDescription', 'voicetools'),"javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','pc','all','".$createWorkflow."')");//for 3.1
-
- /***************
- VALIDATION BAR
- ****************/
- $actionParameters = array("value"=>get_string('cancel', 'voicetools'),"style"=>"action","action"=>"launchAjaxRequest");
-
- if($createWorkflow=="true")
- $xml->createValidationButtonElement(get_string("validationElement_cancel", "voicetools"), "action", "javascript:redirectToActivity('manageAction.php','redirection','','".$createWorkflow."')", "setting_Cancel");
- else
- $xml->createValidationButtonElement(get_string("validationElement_cancel", "voicetools"), "action", "javascript:launchAjaxRequest('getXmlListPanel.php','',true,'all')", "setting_Cancel");
-
-
-}else{ //bad session
- $xml->setError(get_string ($session->error, 'voicetools'));
-}
-echo $xml->getXml();
+ global $CFG;
+ require_once("../../config.php");
+ require_once("lib.php");
+ require_once("lib/php/common/WimbaXml.php");
+ require_once("lib/php/common/WimbaCommons.php");
+ require_once("lib/php/common/WimbaLib.php");
+ if (version_compare(PHP_VERSION,'5','>=')) {
+ require_once('lib/php/common/domxml-php4-php5.php');
+ }
+
+
+ foreach(getKeysOfGeneralParameters() as $param){
+ $value=optional_param($param["value"],$param["default_value"],$param["type"]);
+ if($value!=null)
+ {
+ $params[$param["value"]] = $value;
+ }
+ }
+
+ require_login($params["enc_course_id"]);
+ $createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
+ $xml=new WimbaXml();
+ $session=new WimbaMoodleSession($params);
+
+ if($session->error==false)//no error
+ {
+ /********
+ HEADER
+ *********/
+ $xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "true", "true");
+ /********
+ SESSION
+ *********/
+ $xml->CreateInformationElement($session->timeOfLoad,
+ $session->hparams["firstname"],
+ $session->hparams["lastname"],
+ $session->hparams["email"],
+ $session->hparams["role"],
+ $session->hparams["course_id"],
+ $session->signature,"");
+ /************
+ INFORMATIONS
+ *************/
+ $xml->addContextBarElement(get_string('new_tool','voicetools'));
+
+ /***************
+ PRODUCTS CHOICE
+ ****************/
+ $xml->addProductChoice("lib/web/pictures/buttons/new-createvoiceboard.png",
+ get_string('new_board', 'voicetools'),
+ get_string('VoiceBoardDescription', 'voicetools'),
+ "javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','board','all','".$createWorkflow."')");
+
+
+ $xml->addProductChoice("lib/web/pictures/buttons/new-createvoicepresentation.png",
+ get_string('new_presentation', 'voicetools'),
+ get_string('VoicePresentationDescription', 'voicetools'),
+ "javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','presentation','all','".$createWorkflow."')");
+
+ $xml->addProductChoice("lib/web/pictures/buttons/new-createpodcaster.png",
+ get_string('new_podcaster', 'voicetools'),
+ get_string('PodcasterDescription', 'voicetools'),
+ "javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','pc','all','".$createWorkflow."')");//for 3.1
+
+ /***************
+ VALIDATION BAR
+ ****************/
+ $actionParameters = array("value"=>get_string('cancel', 'voicetools'),
+ "style"=>"action",
+ "action"=>"launchAjaxRequest");
+
+ if($createWorkflow==true)
+ {
+ $xml->createValidationButtonElement(get_string("validationElement_cancel", "voicetools"),
+ "action",
+ "javascript:redirectToActivity('manageAction.php','redirection','','".$createWorkflow."')",
+ "setting_Cancel");
+ }
+ else
+ {
+ $xml->createValidationButtonElement(get_string("validationElement_cancel", "voicetools"),
+ "action",
+ "javascript:launchAjaxRequest('getXmlListPanel.php','',true,'all')",
+ "setting_Cancel");
+ }
+
+ }else
+ { //bad session
+ $xml->setError(get_string ($session->error, 'voicetools'));
+ }
+ echo $xml->getXml();
?>
\ No newline at end of file
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-02-05 22:47:38 UTC (rev 237)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-02-05 22:47:59 UTC (rev 238)
@@ -56,11 +56,8 @@
}
require_login($params["enc_course_id"]);
-$session=new WimbaMoodleSession($params);
-$uiManager=new WimbaUI($session);
+$uiManager=new WimbaUI($params);
-
-
if(isset($params["error"]) )
{
$uiManager->setError(get_string ($params["error"], 'voicetools'));
@@ -68,7 +65,7 @@
else
{
//Session Management
- if($session->error==false)//good
+ if($uiManager->getSessionError()==false)//good
{
$message="";
if(!empty($messageProduct) && !empty($messageAction))
@@ -77,7 +74,7 @@
}
else
{ //bad session
- $uiManager->setError(get_string ('error_'.$session->error, 'voicetools'));
+ $uiManager->setError(get_string ('error_'.$uiManager->getError(), 'voicetools'));
}
}
echo $uiManager->getXmlString();
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php 2008-02-05 22:47:38 UTC (rev 237)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php 2008-02-05 22:47:59 UTC (rev 238)
@@ -1,109 +1,103 @@
-<?php
+<?php
/******************************************************************************
-* *
-* Copyright (c) 1999-2006 Horizon Wimba, All Rights Reserved. *
-* *
-* COPYRIGHT: *
-* This software is the property of Horizon Wimba. *
-* You can redistribute it and/or modify it under the terms of *
-* the GNU General Public License as published by the *
-* Free Software Foundation. *
-* *
-* WARRANTIES: *
-* This software is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public License *
-* along with the Horizon Wimba Moodle Integration; *
-* if not, write to the Free Software Foundation, Inc., *
-* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
-* *
-* Author: Hazan Samy *
-* *
-* Date: October 2006 *
-* *
-******************************************************************************/
+ * *
+ * Copyright (c) 1999-2006 Horizon Wimba, All Rights Reserved. *
+ * *
+ * COPYRIGHT: *
+ * This software is the property of Horizon Wimba. *
+ * You can redistribute it and/or modify it under the terms of *
+ * the GNU General Public License as published by the *
+ * Free Software Foundation. *
+ * *
+ * WARRANTIES: *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with the Horizon Wimba Moodle Integration; *
+ * if not, write to the Free Software Foundation, Inc., *
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
+ * *
+ * Author: Hazan Samy *
+ * *
+ * Date: October 2006 *
+ * *
+ ******************************************************************************/
/* $Id: getXmlNewPanel.php 52710 2007-08-20 19:54:04Z thomasr $ */
/// This page is to generate the list of VT
-global $CFG;
-require_once("../../config.php");
-require_once("lib.php");
-require_once("lib/php/vt/WimbaVoicetoolsAPI.php");
-require_once("lib/php/vt/WimbaVoicetools.php");
-require_once("lib/php/common/WimbaCommons.php");
-require_once("lib/php/common/WimbaXml.php");
-require_once("lib/php/common/WimbaUI.php");
-require_once("lib/php/common/WimbaLib.php");
-if (version_compare(PHP_VERSION,'5','>=')) {
- require_once('lib/php/common/domxml-php4-php5.php');
-}
-
-$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
-foreach(getKeysOfGeneralParameters() as $param)
-{
- $value=optional_param($param["value"],$param["default_value"],$param["type"]);
- if($value!=null)
- $params[$param["value"]] = $value;
-}
-
-require_login($params["enc_course_id"]);
-$session=new WimbaMoodleSession($params);
-$uiManager=new WimbaUI($session);
-
-if($session->error==false)
-{
- /*******************
- GET URL INFORMATIONS
- ********************/
- $action = optional_param('action', ""); // Course Module ID, or
- $typeProduct = $params['type'];
- add_to_log($session->getCourseId(), "voicetools", "xml", "product" , $typeProduct);
-
- if($action == 'update')
- { //get the information of the resource
- $currentBoard = voicetools_api_get_resource($params["resource_id"]);
-
- if($currentBoard==null || $currentBoard->error==true)
+ global $CFG;
+ require_once("../../config.php");
+ require_once("lib.php");
+ require_once("lib/php/vt/WimbaVoicetoolsAPI.php");
+ require_once("lib/php/vt/WimbaVoicetools.php");
+ require_once("lib/php/common/WimbaCommons.php");
+ require_once("lib/php/common/WimbaXml.php");
+ require_once("lib/php/common/WimbaUI.php");
+ require_once("lib/php/common/WimbaLib.php");
+ if (version_compare(PHP_VERSION,'5','>=')) {
+ require_once('lib/php/common/domxml-php4-php5.php');
+ }
+
+ $createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
+ foreach(getKeysOfGeneralParameters() as $param)
{
- $uiManager->setError(get_string('problem_vt','voicetools'));
+ $value=optional_param($param["value"],$param["default_value"],$param["type"]);
+ if($value!=null)
+ {
+ $params[$param["value"]] = $value;
+ }
}
- $currentBoardInformations=voicetools_get_voiceboard_Informations($params["resource_id"]);
+ require_login($params["enc_course_id"]);
+ $uiManager=new WimbaUI($params);
- if($currentBoard->error==true)
+ if($uiManager->getSessionError()==false)
{
- $uiManager->setError(get_string('problem_bd','voicetools'));
+ /*******************
+ GET URL INFORMATIONS
+ ********************/
+ $action = optional_param('action', ""); // Course Module ID, or
+ $typeProduct = $params['type'];
+ add_to_log($uiManager->getSession()->getCourseId(), "voicetools", "xml", "product" , $typeProduct);
+
+ if($action == 'update')
+ { //get the information of the resource
+ $currentBoard = voicetools_api_get_resource($params["resource_id"]);
+
+ if($currentBoard==null || $currentBoard->error==true)
+ {
+ $uiManager->setError(get_string('problem_vt','voicetools'));
+ }
+
+ $currentBoardInformations=voicetools_get_voiceboard_Informations($params["resource_id"]);
+ // print_r($currentBoardInformations);
+ if($currentBoard->error==true)
+ {
+ $uiManager->setError(get_string('problem_bd','voicetools'));
+ }
+
+ $uiManager->setCurrentProduct($typeProduct,$currentBoard,$currentBoardInformations);
+
+ }
+ else
+ {
+ $uiManager->setCurrentProduct($typeProduct);
+ }
+
+ $display= $uiManager->getVTSettingsView($action,$createWorkflow);
+
}
+ else
+ {
+ $uiManager->setError(get_string ($uiManager->getSessionError(), 'voicetools'));
+ }
- $uiManager->setCurrentProduct($typeProduct,$currentBoard,$currentBoardInformations);
-
- }
- else
- {
- $uiManager->setCurrentProduct($typeProduct);
- }
-
- $display= $uiManager->getVTSettingsView($action,$createWorkflow);
-
-}
-else
-{
- if($session->error=="session")
- {
- $uiManager->setError(get_string ('session', 'voicetools'));
- }
- else if($session->error=="signature")
- {
- $uiManager->setError(get_string ('signature', 'voicetools'));
- }
-}
-
-echo $uiManager->getXmlString();
+ echo $uiManager->getXmlString();
?>
Modified: branches/team/Thomas/moodle/mod/voicetools/index.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/index.php 2008-02-05 22:47:38 UTC (rev 237)
+++ branches/team/Thomas/moodle/mod/voicetools/index.php 2008-02-05 22:47:59 UTC (rev 238)
@@ -35,7 +35,7 @@
require_once("lib/php/common/WimbaLib.php");
$course_id = optional_param('id', 0, PARAM_INT); // course
-$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
+$createWorkflow = optional_param('createWorkflow', "false", PARAM_ALPHA); // course
if (! $course = get_record("course", "id", $course_id)) {
error("Course ID is incorrect");
Modified: branches/team/Thomas/moodle/mod/voicetools/lib.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-02-05 22:47:38 UTC (rev 237)
+++ branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-02-05 22:47:59 UTC (rev 238)
@@ -51,40 +51,44 @@
-The api account has to valid
********/
- if(empty($config->servername))
- {
+ if(empty($config->servername))
+ {
error(get_string('wrongconfigurationURLunavailable', 'voicetools'), $_SERVER["HTTP_REFERER"]);
- }
-
- if(empty($config->adminusername))
- {
+ }
+
+ if(empty($config->adminusername))
+ {
error(get_string('emptyAdminUsername', 'voicetools'), $_SERVER["HTTP_REFERER"]);
- }
-
- if(empty($config->adminpassword))
- {
+ }
+
+ if(empty($config->adminpassword))
+ {
error(get_string('emptyAdminPassword', 'voicetools'), $_SERVER["HTTP_REFERER"]);
- }
-
- if ($config->servername{strlen($config->servername)-1} == '/')
- {
+ }
+
+ if ($config->servername{strlen($config->servername)-1} == '/')
+ {
error(get_String('trailingSlash', 'voicetools'), $_SERVER["HTTP_REFERER"]);
- }
-
- if (!preg_match('/^http:\/\//', $config->servername) && !preg_match('/^https:\/\//', $config->servername))
- {
+ }
+
+ if (!preg_match('/^http:\/\//', $config->servername) && !preg_match('/^https:\/\//', $config->servername))
+ {
error(get_String('trailingHttp', 'voicetools'), $_SERVER["HTTP_REFERER"]);
- }
-
- //check if the api account filled is correct and allowed
- $result = voicetools_api_check_documentbase ($config->servername, $config->adminusername,$config->adminpassword,$CFG->wwwroot);
-
- if ($result != "ok") {
- if(get_string($result, 'voicetools' ) == "[[]]")//the error description is not in the bundle
- error($result, 'javascript:history.back();');
- else
- error(get_string($result, 'voicetools' ), 'javascript:history.back();');
- }
+ }
+
+ //check if the api account filled is correct and allowed
+ $result = voicetools_api_check_documentbase ($config->servername, $config->adminusername,$config->adminpassword,$CFG->wwwroot);
+
+ if ($result != "ok")
+ {
+ if(get_string($result, 'voicetools' ) == "[[]]")
+ {//the error description is not in the bundle
+ error($result, 'javascript:history.back();');
+ }
+ else{
+ error(get_string($result, 'voicetools' ), 'javascript:history.back();');
+ }
+ }
}
function voicetools_add_instance($voicetool) {
@@ -104,7 +108,8 @@
return false;
}
- if(isset($voicetool->calendar_event) && $voicetool->calendar_event==true) {
+ if(isset($voicetool->calendar_event) && $voicetool->calendar_event==true)
+ {
voicetools_addCalendarEvent($voicetool);
}
@@ -118,27 +123,32 @@
global $USER;
//get the course_module instance linked to the liveclassroom instance
- if (! $cm = get_coursemodule_from_instance("voicetools", $voicetool->id, $voicetool->course)) {
+ if (! $cm = get_coursemodule_from_instance("voicetools", $voicetool->id, $voicetool->course))
+ {
error("Course Module ID was incorrect");
}
if($voicetool->section != $cm->section)//the scetion has changed
{
//Find the right section in the course_section
- if (!$section = get_record("course_sections", "id", $cm->section)){
+ if (!$section = get_record("course_sections", "id", $cm->section))
+ {
return false;
}
//delete in the course section
- if (! delete_mod_from_section($cm->id, $cm->section)) {
+ if (! delete_mod_from_section($cm->id, $cm->section))
+ {
return false;
}
//update the course module section
- if (! $sectionid = add_mod_to_section($voicetool) ) {
+ if (! $sectionid = add_mod_to_section($voicetool) )
+ {
error("Could not add the new course module to that section");
}
//update the course modules
- if (! set_field("course_modules", "section", $sectionid, "id", $cm->id)) {
+ if (! set_field("course_modules", "section", $sectionid, "id", $cm->id))
+ {
error("Could not update the course module with the correct section");
}
}
@@ -149,11 +159,13 @@
$voicetool->rid=$rid;
$voicetool->name=get_string("$type","voicetools").$voicetool->name;
- if (!$voicetool->id = update_record('voicetools', $voicetool)) {
+ if (!$voicetool->id = update_record('voicetools', $voicetool))
+ {
return false;
}
- if(isset($voicetool->calendar_event) && $voicetool->calendar_event==true) {//no problem
+ if(isset($voicetool->calendar_event) && $voicetool->calendar_event==true)
+ {//no problem
voicetools_addCalendarEvent($voicetool,$voicetool->id );
}
else
@@ -170,11 +182,13 @@
/// this function will permanently delete the instance
/// and any data that depends on it.
$result = true;
- if (! $voicetool = get_record("voicetools", "id", "$id")) {
+ if (! $voicetool = get_record("voicetools", "id", "$id"))
+ {
return false;
}
# Delete any dependent records here #
- if (! $instanceNumber=delete_records("voicetools", "id", "$voicetool->id")) {
+ if (! $instanceNumber=delete_records("voicetools", "id", "$voicetool->id"))
+ {
add_to_log($voicetool->course, "voicetools", "Delete activity",voicetools_send_logs("errorDeleteInstance","voicetoolsId=".$instanceNumber), "Activity ".$voicetool->name." deletion failed");
$result = false;
}
@@ -457,11 +471,12 @@
$tool = get_record('voicetools_resources','rid',$rid);
- if(empty($tool)){
- return NULL;
-
+ if(empty($tool))
+ {
+ return null;
}
- else if($tool == false) {
+ else if($tool == false)
+ {
error( "Response get_board_list : query to database failed");
return "error_moodleDatabase";
}
Modified: branches/team/Thomas/moodle/mod/voicetools/manageAction.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/manageAction.php 2008-02-05 22:47:38 UTC (rev 237)
+++ branches/team/Thomas/moodle/mod/voicetools/manageAction.php 2008-02-05 22:47:59 UTC (rev 238)
@@ -1,6 +1,4 @@
<?php
-
-
/******************************************************************************
* *
* Copyright (c) 1999-2006 Horizon Wimba, All Rights Reserved. *
@@ -40,13 +38,10 @@
require_once ('lib/php/vt/WimbaVoicetoolsAPI.php');
require_once ('lib/php/vt/VtAction.php');
-
-
-
$messageProduct=optional_param("messageProduct","");
$messageAction=optional_param("messageAction","");
$notool=optional_param("novoicetools","false");
-$createWorkflow = optional_param('createWorkflow', $dddddd, PARAM_BOOL); // course
+$createWorkflow = optional_param("createWorkflow", false, PARAM_BOOL); // course
$keys=array_merge(getKeysOfGeneralParameters(),getKeyWimbaVoiceForm());
foreach($keys as $param){
@@ -60,12 +55,15 @@
$vtAction = new vtAction($params);
$session = new WimbaMoodleSession($params);
-$redirectionUrl='welcome.php?id=' . $session->getCourseId() . '&' . $session->url_params . '&time=' . $session->timeOfLoad;
-$urlModuleForm=$CFG->wwwroot.'/course/mod.php?section=0&sesskey='.sesskey().'&id='.$session->getCourseId().'&add=voicetools&rid='.$rid;
+$redirectionUrl='welcome.php?id=' . $session->getCourseId() . '&' .
+ $session->url_params . '&time=' . $session->timeOfLoad;
+$urlModuleForm=$CFG->wwwroot.'/course/mod.php?section=0&sesskey='.sesskey().
+ '&id='.$session->getCourseId().'&add=voicetools&rid=';
+
$messageType = "";
-if ($session->error == false && $session != NULL || $CFG->error==true) {
+if ($session->error == false && $session != NULL ) {
if ($params['action'] == 'launch') {
$session->setCurrentVtUSer($params["type"]);
if ($params["studentView"] == "true") {
@@ -73,10 +71,12 @@
}
$resource = voicetools_api_get_resource($params["resource_id"]);
$result = $vtAction->getVtSession($resource, $session->getVtUser(), $session->getVtUserRigths());
- if ($result != NULL) {
+ if ($result != NULL)
+ {
redirection($CFG->voicetools_servername . '/' . $params["type"] . '?action=display_popup&nid=' . $result->getNid());
}
- else {
+ else
+ {
redirection($redirectionUrl.'&error=problem_vt');
}
}
@@ -103,9 +103,10 @@
if ($result != NULL && $result->error != "error")
{
- $params["resource_id"] = storeResource($result->getRid(), $session->getCourseId(), $params['type'],$params["longname"], $params);
-
- if (empty ($params["resource_id"])) {
+ $params["resource_id"] = storeResource($result->getRid(), $params);
+
+ if (empty ($params["resource_id"]))
+ {
error_log(__FUNCTION__ . " : Problem to add the new resource on the database", TRUE);
redirection($redirectionUrl. '&error=problem_bd');
}
@@ -143,7 +144,7 @@
if ($result != NULL)
{
//create the object to store in the db
- $params["resource_id"] = updateResource($result->getRid(), $session->getCourseId(), $param['type'], $param, $params["resource_id"]);
+ $params["resource_id"] = updateResource($result->getRid(), $params);
if (empty ($params["resource_id"]))
{
@@ -161,25 +162,25 @@
}
elseif ($params['action'] == 'delete')
{
- $result = $vtAction->deleteRessource($params["resource_id"]);
+ $result = $vtAction->deleteResource($params["resource_id"]);
if ($result != NULL && $result->error != "error") { //if no error during the creation
if (! voicetools_delete_all_instance_of_resource($params["resource_id"])) {
notify("Could not delete the activities for the vocietools:". $params["resource_id"]);
}
$messageType = 'delete' . $param["type"];
$messageAction = "deleted";
- $messageProduct = $_GET["type"];
+ $messageProduct = $params["type"];
}
}
- if (isset($createWorkflow) && $createWorkflow == true)
+ if ($createWorkflow == true)
{
if(!isset($result) )
$rid="";
else
$rid=$result->getRid();
- parentRedirection($urlModuleForm);
+ parentRedirection($urlModuleForm.$rid);
}
else
{
Modified: branches/team/Thomas/moodle/mod/voicetools/manageActionBlock.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/manageActionBlock.php 2008-02-05 22:47:38 UTC (rev 237)
+++ branches/team/Thomas/moodle/mod/voicetools/manageActionBlock.php 2008-02-05 22:47:59 UTC (rev 238)
@@ -37,27 +37,23 @@
require_once('lib/php/vt/WimbaVoicetools.php');
require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
global $CFG;
+$action = optional_param("action", "", PARAM_ALPHA); // course
-
-if($_GET['action']=='updateRecorder')
- {
+if($action == 'updateRecorder')
+{
$bId = required_param('block_id', PARAM_SAFEDIR);
- $comment=required_param('comment', PARAM_SAFEDIR);
- $title=required_param('title', PARAM_SAFEDIR);
- $comment=str_replace("\n","<br>",$comment);
-
- $resourceId=voicetools_update_recorder_informations($bId,$comment,$title);
+ $comment = required_param('comment', PARAM_SAFEDIR);
+ $title = required_param('title', PARAM_SAFEDIR);
+ $comment = str_replace("\n","<br>",$comment);
+ $resourceId = voicetools_update_recorder_informations($bId,$comment,$title);
if(empty($resourceId))
{
echo "error.php?error=problem_db";
exit();
}
- print "good";
- exit();
-
+ print "good";
+ exit();
+}
-
-
-
-} ?>
\ No newline at end of file
+?>
\ No newline at end of file
Modified: branches/team/Thomas/moodle/mod/voicetools/mod.html
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-02-05 22:47:38 UTC (rev 237)
+++ branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-02-05 22:47:59 UTC (rev 238)
@@ -51,19 +51,24 @@
$sectionId = optional_param('section', null, PARAM_INT);
/// First we check that form variables have been initialised
-if (!isset($form->name)) {
+if (!isset($form->name))
+{
$form->name = '';
}
-if (!isset($form->type)) {
+if (!isset($form->type))
+{
$form->type = '';
}
-if (!isset($form->intro)) {
+if (!isset($form->intro))
+{
$form->intro = '';
}
-if (!isset($form->descrption)) {
+if (!isset($form->descrption))
+{
$form->descrption = '';
}
-if (!isset($form->section)) {
+if (!isset($form->section))
+{
$form->section = '';
}
$error="";
@@ -74,7 +79,8 @@
if(isset($update)){ //update
//get the information of the activity
- if (! $cmVT = get_record("course_modules", "id", $update)) {
+ if (! $cmVT = get_record("course_modules", "id", $update))
+ {
return false;
}
@@ -114,13 +120,14 @@
$disabledCheckbox="";
$disableAllElements="";
}
-
-
-
+
// Visible to students or not
-if ($form->coursemodule) {
+if ($form->coursemodule)
+{
$visible = get_field('course_modules', 'visible', 'id', $form->coursemodule);
-} else {
+}
+else
+{
$visible = true;
}
@@ -131,7 +138,9 @@
{
$hiddensection = !get_field('course_sections', 'visible', 'id', $form->section);
}
-if ($hiddensection) {
+
+if ($hiddensection)
+{
$visible = false;
}
@@ -145,16 +154,16 @@
?>
-<link rel="STYLESHEET" href="<?php p($CFG->wwwroot) ?>/mod/liveclassroom/css/StyleSheet.css"" type="text/css" />
+<link rel="STYLESHEET" href="<?php p($CFG->wwwroot) ?>/mod/voicetools/css/StyleSheet.css"" type="text/css" />
<style>
-body{
+body
+{
font-size:14px;
}
.content
{
margin:-5px;
}
-
</style>
<script type="text/javascript">
@@ -168,13 +177,20 @@
else var expires = "";
document.cookie = name+"="+value+expires+"; path=/";
}
+
function readCookie(name) {
var nameEQ = name + "=";
var ca = document.cookie.split(';');
- for(var i=0;i < ca.length;i++) {
+ for(var i=0;i < ca.length;i++)
+ {
var c = ca[i];
- while (c.charAt(0)==' ') c = c.substring(1,c.length);
- if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+ while (c.charAt(0)==' '){
+ c = c.substring(1,c.length);
+ }
+ if (c.indexOf(nameEQ) == 0)
+ {
+ return c.substring(nameEQ.length,c.length);
+ }
}
return null;
}
@@ -185,35 +201,42 @@
function booleanValue(value){
if(value=="false")
+ {
return false;
- else
+ }
+ else
+ {
return true;
+ }
}
function validate(){
- // name can't be null
- if(document.getElementById("name").value == ""){
- alert("Please a name is required.");
- return false;
- }else if(document.getElementById("name").value.length>=255){
- alert("Please choose an activity name that is less than 255 characters.");
- return false;
- }else if(document.getElementById("resource").value=="empty"){
- alert("Please select a Voice Tools.");
- return false;
-
- }
- document.getElementById("form").submit();
+ // name can't be null
+ if(document.getElementById("name").value == "")
+ {
+ alert("Please a name is required.");
+ return false;
+ }
+ else if(document.getElementById("name").value.length>=255)
+ {
+ alert("Please choose an activity name that is less than 255 characters.");
+ return false;
+ }
+ else if(document.getElementById("resource").value=="empty")
+ {
+ alert("Please select a Voice Tools.");
+ return false;
+ }
+
+ document.getElementById("form").submit();
}
function TestNoTool() {
<?php
$listTools = voicetools_get_voicetools_list($course->id);
if($listTools==NULL) { //no voice tools available
- ?>
-
-
+ ?>
document.getElementById("hiddenDiv").style.height=document.documentElement.clientHeight
document.getElementById("hiddenDiv").style.width=document.documentElement.clientWidth
document.getElementById("popup").style.display="block";
@@ -240,64 +263,127 @@
//save the form fields
if(document.getElementById("name")!=null)
+ {
createCookie("name",document.getElementById("name").value);
+ }
+
if(document.getElementById("section")!=null)
- createCookie("section",document.getElementById("section").selectedIndex);
+ {
+ createCookie("section",document.getElementById("section").selectedIndex);
+ }
+
if(document.getElementById("menuvisible")!=null)
- createCookie("menuvisible",document.getElementById("menuvisible").selectedIndex);
-
+ {
+ createCookie("menuvisible",document.getElementById("menuvisible").selectedIndex);
+ }
//calendar
if(document.getElementById("calendar_event")!=null)
- createCookie("calendar_event",document.getElementById("calendar_event").checked);
+ {
+ createCookie("calendar_event",document.getElementById("calendar_event").checked);
+ }
+
if(document.getElementById("start_month")!=null)
- createCookie("start_month",document.getElementById("start_month").selectedIndex);
+ {
+ createCookie("start_month",document.getElementById("start_month").selectedIndex);
+ }
+
if(document.getElementById("start_day")!=null)
- createCookie("start_day",document.getElementById("start_day").selectedIndex);
+ {
+ createCookie("start_day",document.getElementById("start_day").selectedIndex);
+ }
+
if(document.getElementById("start_year")!=null)
- createCookie("start_year",document.getElementById("start_year").selectedIndex);
+ {
+ createCookie("start_year",document.getElementById("start_year").selectedIndex);
+ }
+
if(document.getElementById("start_hr")!=null)
- createCookie("start_hr",document.getElementById("start_hr").selectedIndex);
+ {
+ createCookie("start_hr",document.getElementById("start_hr").selectedIndex);
+ }
+
if(document.getElementById("start_min")!=null)
- createCookie("start_min",document.getElementById("start_min").selectedIndex);
+ {
+ createCookie("start_min",document.getElementById("start_min").selectedIndex);
+ }
+
if(document.getElementById("duration_hr")!=null)
- createCookie("duration_hr",document.getElementById("duration_hr").selectedIndex);
+ {
+ createCookie("duration_hr",document.getElementById("duration_hr").selectedIndex);
+ }
+
if(document.getElementById("duration_min")!=null)
- createCookie("duration_min",document.getElementById("duration_min").selectedIndex);
+ {
+ createCookie("duration_min",document.getElementById("duration_min").selectedIndex);
+ }
+
if(document.getElementById("description")!=null)
+ {
createCookie("description",document.getElementById("description").value);
+ }
-
//manage the availability of the calendar
if(document.getElementById("calendar_event")!=null)
- createCookie("calendar_event_disabled",document.getElementById("calendar_event").disabled);
+ {
+ createCookie("calendar_event_disabled",document.getElementById("calendar_event").disabled);
+ }
+
if(document.getElementById("start_month")!=null)
- createCookie("start_month_disabled",document.getElementById("start_month").disabled);
+ {
+ createCookie("start_month_disabled",document.getElementById("start_month").disabled);
+ }
+
if(document.getElementById("start_day")!=null)
- createCookie("start_day_disabled",document.getElementById("start_day").disabled);
+ {
+ createCookie("start_day_disabled",document.getElementById("start_day").disabled);
+ }
+
if(document.getElementById("start_year")!=null)
- createCookie("start_year_disabled",document.getElementById("start_year").disabled);
+ {
+ createCookie("start_year_disabled",document.getElementById("start_year").disabled);
+ }
+
if(document.getElementById("start_hr")!=null)
- createCookie("start_hr_disabled",document.getElementById("start_hr").disabled);
+ {
+ createCookie("start_hr_disabled",document.getElementById("start_hr").disabled);
+ }
+
if(document.getElementById("start_min")!=null)
- createCookie("start_min_disabled",document.getElementById("start_min").disabled);
+ {
+ createCookie("start_min_disabled",document.getElementById("start_min").disabled);
+ }
if(document.getElementById("duration_hr")!=null)
- createCookie("duration_hr_disabled",document.getElementById("duration_hr").disabled);
+ {
+ createCookie("duration_hr_disabled",document.getElementById("duration_hr").disabled);
+ }
+
if(document.getElementById("duration_min")!=null)
- createCookie("duration_min_disabled",document.getElementById("duration_min").disabled);
+ {
+ createCookie("duration_min_disabled",document.getElementById("duration_min").disabled);
+ }
+
if(document.getElementById("description")!=null)
+ {
createCookie("description_disabled",document.getElementById("description").disabled);
-
+ }
+
location.href = "<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $course_id;?>&createWorkflow=true";
}
+
function hideCalendarEvent(value){
- if(value=="check"){
+ if(value=="check")
+ {
if(document.getElementById("calendar_event").checked==true)
+ {
value="";
+ }
else
+ {
value="disabled";
+ }
+ }
- }
document.getElementById("start_hr").disabled=value ;
document.getElementById("start_min").disabled=value ;
document.getElementById("duration_hr").disabled=value ;
@@ -312,18 +398,28 @@
function change(){
- if(document.getElementById("section").value == 0){
+ if(document.getElementById("section").value == 0)
+ {
hideCalendarEvent("disabled");
document.getElementById("calendar_event").disabled="disabled";
document.getElementById("comment_date").innerHTML="";
- }else{
+ }
+ else
+ {
document.getElementById("calendar_event").disabled="";
- if(document.getElementById("calendar_event").checked==false)
+ if(document.getElementById("calendar_event").checked==false)
+ {
hideCalendarEvent("disabled");
+ }
else
- hideCalendarEvent("");
+ {
+ hideCalendarEvent("");
+ }
- var value=parseInt("<?php echo $course->startdate ?>") + parseInt((document.getElementById("section").value -1) * 604800) + parseInt(document.getElementById("start_day").value) + 3600; //add 3600 for ie
+ var value = parseInt("<?php echo $course->startdate ?>") +
+ parseInt((document.getElementById("section").value -1) * 604800) +
+ parseInt(document.getElementById("start_day").value) + 3600; //add 3600 for ie
+
var date = new Date(value*1000);
document.getElementById("calendar_start").value= value;
document.getElementById("comment_date").innerHTML= (date.getMonth()+1)+"/"+ date.getDate()+"/"+date.getFullYear();
@@ -333,70 +429,90 @@
function FillForm(){
- if(document.getElementById("name")!=null && readCookie("name")!=null){
+ if(document.getElementById("name")!=null && readCookie("name")!=null)
+ {
document.getElementById("name").value=[readCookie("name")];
deleteCookie("name");
}
- if(document.getElementById("section")!=null && readCookie("section")!=null){
+
+ if(document.getElementById("section")!=null && readCookie("section")!=null)
+ {
document.getElementById("section")[readCookie("section")].selected=true;
deleteCookie("section");
}
- if(document.getElementById("menuvisible")!=null && readCookie("menuvisible")!=null){
+
+ if(document.getElementById("menuvisible")!=null && readCookie("menuvisible")!=null)
+ {
document.getElementById("menuvisible")[readCookie("menuvisible")].selected=true;
deleteCookie("menuvisible");
}
- if(document.getElementById("calendar_event")!=null && readCookie("calendar_event")!=null){
+
+ if(document.getElementById("calendar_event")!=null && readCookie("calendar_event")!=null)
+ {
document.getElementById("calendar_event").checked=readCookie("calendar_event");
document.getElementById("calendar_event").disabled=booleanValue(readCookie("calendar_event_disabled"));
deleteCookie("calendar_event");
deleteCookie("calendar_event_disabled");
}
- if(document.getElementById("start_month")!=null && readCookie("start_month")!=null){
+
+ if(document.getElementById("start_month")!=null && readCookie("start_month")!=null)
+ {
document.getElementById("start_month")[readCookie("start_month")].selected=true;
document.getElementById("start_month").disabled=booleanValue(readCookie("start_month_disabled"));
deleteCookie("start_month");
deleteCookie("start_month_disabled");
}
- if(document.getElementById("start_day")!=null && readCookie("start_day")!=null){
+
+ if(document.getElementById("start_day")!=null && readCookie("start_day")!=null)
+ {
document.getElementById("start_day")[readCookie("start_day")].selected=true;
document.getElementById("start_day").disabled=booleanValue(readCookie("start_day_disabled"));
deleteCookie("start_day");
deleteCookie("start_day_disabled");
}
- if(document.getElementById("start_year")!=null && readCookie("start_year")!=null){
+
+ if(document.getElementById("start_year")!=null && readCookie("start_year")!=null)
+ {
document.getElementById("start_year")[readCookie("start_year")].selected=true;
document.getElementById("start_year").disabled=booleanValue(readCookie("start_year_disabled"));
deleteCookie("start_year");
deleteCookie("start_year_disabled");
}
- if(document.getElementById("start_hr")!=null && readCookie("start_hr")!=null){
+ if(document.getElementById("start_hr")!=null && readCookie("start_hr")!=null)
+ {
document.getElementById("start_hr")[readCookie("start_hr")].selected=true;
document.getElementById("start_hr").disabled=booleanValue(readCookie("start_hr_disabled"));
deleteCookie("start_hr");
deleteCookie("start_hr_disabled");
}
- if(document.getElementById("duration_hr")!=null && readCookie("duration_hr")!=null){
+ if(document.getElementById("duration_hr")!=null && readCookie("duration_hr")!=null)
+ {
document.getElementById("duration_hr")[readCookie("duration_hr")].selected=true;
document.getElementById("duration_hr").disabled=booleanValue(readCookie("duration_hr_disabled"));
deleteCookie("duration_hr");
deleteCookie("duration_hr_disabled");
}
- if(document.getElementById("duration_min")!=null && readCookie("duration_min")!=null){
+ if(document.getElementById("duration_min")!=null && readCookie("duration_min")!=null)
+ {
document.getElementById("duration_min")[readCookie("duration_min")].selected=true;
document.getElementById("duration_min").disabled=booleanValue(readCookie("duration_min_disabled"));
deleteCookie("duration_min");
deleteCookie("duration_min_disabled");
}
- if(document.getElementById("start_min")!=null && readCookie("start_min")!=null){
+
+ if(document.getElementById("start_min")!=null && readCookie("start_min")!=null)
+ {
document.getElementById("start_min")[readCookie("start_min")].selected=true;
document.getElementById("start_min").disabled=booleanValue(readCookie("start_min_disabled"));
deleteCookie("start_min");
deleteCookie("start_min_disabled");
}
- if(document.getElementById("description")!=null && readCookie("description")!=null){
+
+ if(document.getElementById("description")!=null && readCookie("description")!=null)
+ {
document.getElementById("description").value=readCookie("description");
document.getElementById("description").disabled=booleanValue(readCookie("description_disabled"));
deleteCookie("description");
@@ -410,7 +526,6 @@
}
window.onload=loadPage;
-
</script>
<title>Wimba</title>
@@ -431,7 +546,7 @@
</tr>
</table>
</div>
- <div id="contextBar" width=700px align=center>
+ <div id="contextBar" width=700px align=center style="border-bottom: solid 1px #D9DEE5;">
<table width=700px align=center>
<tbody>
<tr>
@@ -448,7 +563,7 @@
<table border="0" width="700px" align=center cellpadding="5" cellspacing="0">
<tr valign="top">
<td align="right">
- <font color="red">*</font> <font class="fontCurrent"><?php print_string('activity_name', 'voicetools') ?></font>
+ <font color="red">*</font><font class="fontCurrent"><?php print_string('activity_name', 'voicetools') ?></font>
</td>
<td align="left">
<input type="text" id="name" name="name" size="25" value="<?php echo $name ?>">
Modified: branches/team/Thomas/moodle/mod/voicetools/view.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/view.php 2008-02-05 22:47:38 UTC (rev 237)
+++ branches/team/Thomas/moodle/mod/voicetools/view.php 2008-02-05 22:47:59 UTC (rev 238)
@@ -28,12 +28,10 @@
/* $Id: view.php 52828 2007-08-23 22:12:28Z thomasr $ */
-/// This page prints a particular instance of voicedirect
-/// (Replace voicedirect with the name of your module)
error_reporting(E_ERROR);
require_once('../../config.php');
require_once('lib.php');
-
+//Wimba Library
require_once ("lib/php/common/WimbaLib.php");
require_once('lib/php/vt/WimbaVoicetools.php');
require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
@@ -41,89 +39,50 @@
require_once('lib/php/vt/vtAction.php');
$id = optional_param('id', 0, PARAM_INT); // Course Module ID, or
+$action = optional_param('action', PARAM_ACTION);
-if ((isset($_GET["action"]) && $_GET["action"]!="launchCalendar" ) && $id || !isset($_GET["action"]) ) {
- if (! $cm = get_record("course_modules", "id", $id)) {
- error("Course Module ID was incorrect");
- }
-
- if (! $course = get_record("course", "id", $cm->course)) {
- error("Course is misconfigured");
- }
-
- if (! $voicetool = get_record("voicetools", "id", $cm->instance)) {
- error("Course module is incorrect");
- }
-
+if ((isset($action) && $action!="launchCalendar" ) && $id || !isset($action) ) {
+ if (! $cm = get_record("course_modules", "id", $id)) {
+ error("Course Module ID was incorrect");
+ }
+
+ if (! $course = get_record("course", "id", $cm->course)) {
+ error("Course is misconfigured");
+ }
+
+ if (! $voicetool = get_record("voicetools", "id", $cm->instance)) {
+ error("Course module is incorrect");
+ }
+
} else {
- if (! $voicetool = get_record("voicetools", "id", $id)) {
- error("Course module is incorrect");
- }
- if (! $course = get_record("course", "id", $voicetool->course)) {
- error("Course is misconfigured");
- }
- if (! $cm = get_coursemodule_from_instance("voicetools", $voicetool->id, $course->id)) {
- error("Course Module ID was incorrect");
- }
- }
+ if (! $voicetool = get_record("voicetools", "id", $id)) {
+ error("Course module is incorrect");
+ }
+ if (! $course = get_record("course", "id", $voicetool->course)) {
+ error("Course is misconfigured");
+ }
+ if (! $cm = get_coursemodule_from_instance("voicetools", $voicetool->id, $course->id)) {
+ error("Course Module ID was incorrect");
+ }
+}
require_login($course->id);
-
add_to_log($course->id, "voicetools", "view", "view.php?id=$cm->id", "$voicetool->id");
-
-$session=new WimbaMoodleSession(NULL);
-
-//check the availability of the resource
-$vt_informations=voicetools_get_voicetool_informations($voicetool->rid);
-if($vt_informations !=null && $vt_informations->availability=="0"){
- $preview = false;
-}
-elseif ($vt_informations !=null && $vt_informations->start_date == -1 && $vt_informations->end_date == -1) {
- $preview = true;
-}
-elseif ($vt_informations !=null && $vt_informations->start_date == -1 && time() <= $vt_informations->end_date) {
- $preview = true;
-}
-elseif ($vt_informations !=null && $vt_informations->start_date < time() && $vt_informations->end_date == -1) {
- $preview = true;
-}
-elseif ($vt_informations !=null && $vt_informations->start_date < time() && time() < $vt_informations->end_date) {
- $preview = true;
-}
-else {
- $preview = false;
-}
-
-
-$resource=voicetools_api_get_resource ($voicetool->rid) ;
-//determinate the role for the wimba tools
-$roleSwitch=isSwitch();//the user have switched his role?
-
-
-
-$role=getRoleForWimbaTools($course->id,$USER->id);
-
-if($resource->error==true){
- error(get_string("problem_vt", "voicetools"), "$CFG->wwwroot/course/view.php?id=$course->id");
-}
-
-$vtAction=new vtAction(NULL);
-$session->setCurrentVtUSer($resource->getType(),$USER->firstname."_".$USER->lastname,$USER->email,$role);
-
-//use a vt user
-
-
-$vtSession=$vtAction->getVtSession($resource,$session->getVtUser(),$session->getVtUserRigths()) ;
-
-
+$servername = $CFG->voicetools_servername;
$strvoicetools = get_string("modulenameplural", "voicetools");
$strvoicetool = get_string("modulename", "voicetools");
-$strname = $voicetool->name;
-
+$sentence1=get_string ('vtpopupshouldappear.1', 'voicetools');
+$sentence2="<a href='javascript:startVoiceBoard ()';>".get_string ('vtpopupshouldappear.2', 'voicetools')."</a>";
+$sentence3=get_string ('vtpopupshouldappear.3', 'voicetools');
+$strLaunchComment=$sentence1.$sentence2.$sentence3;
+
+$completeName=explode(" - ", $voicetool->name);
+$strname=$completeName[1];
+
$navigation = array();
- if ($course->id != SITEID) {
+if ($course->id != SITEID) {
$navigation[$course->shortname] = "$CFG->wwwroot/course/view.php?id=$course->id";
}
$navigation[$strvoicetools] = "$CFG->wwwroot/mod/voicetools/index.php?id=$course->id";
@@ -140,50 +99,55 @@
$breadcrumb = implode(' -> ', $urls);
print_header("$course->shortname: $voicetool->name", "$course->fullname",
-"$breadcrumb",
-"", "", true, update_module_button($cm->id, $course->id, $strvoicetool),
+ $breadcrumb, "", "", true, update_module_button($cm->id, $course->id, $strvoicetool),
navmenu($course, $cm));
-/// Print the main part of the page
+//get the informations related to the Vt resource
+$vtAction=new vtAction();
+$resource=$vtAction->getResource($voicetool->rid) ;
+//check the availability of the resource
+$vtpreview=isVtAvailable($voicetool->rid);
+$roleSwitch=isSwitch();//the user have switched his role?
+//determinate the role for the wimba tools
+$role=getRoleForWimbaTools($course->id,$USER->id);
+
+if($resource->error==true){
+ error(get_string("problem_vt", "voicetools"), "$CFG->wwwroot/course/view.php?id=$course->id");
+}
-$servername = $CFG->voicetools_servername;
+$vtAction=new vtAction(NULL);
+$currentUser=$vtAction->createUser($USER->firstname."_".$USER->lastname,$USER->email);
+$currentUserRights=$vtAction->createUserRights($resource->getType(),$role);
+//get the vt session
+$vtSession=$vtAction->getVtSession($resource,$currentUser,$currentUserRights) ;
+
?>
<script type="text/javascript">
var popup;
function doOpenPopup (url, type)
{
-
popup=window.open (url, type+"_popup", "scrollbars=no,toolbar=no,menubar=no,resizable=yes");
-
}
-
function startVoiceBoard(){
- <?
- if(isset($roleSwitch) && $roleSwitch==true) {
- ?>
- result=window.confirm("<?php echo get_string ('launchstudent', 'voicetools');?>");
- if(result==true) {
- doOpenPopup("<?php echo $servername ?>/<? echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
-
- }
- else
- {
- location.href= document.referrer;
- }
-
- <?}else{
- ?>
- doOpenPopup("<?php echo $servername ?>/<? echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
- <?}?>
+ <? if(isset($roleSwitch) && $roleSwitch==true) { ?>
+ result=window.confirm("<?php echo get_string ('launchstudent', 'voicetools');?>");
+ if(result==true) {
+ doOpenPopup("<?php echo $servername ?>/<? echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
+ }
+ else
+ {
+ location.href= document.referrer;
+ }
+ <? }else{ ?>
+ doOpenPopup("<?php echo $servername ?>/<? echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
+ <? } ?>
}
-
-
+
</script>
-
<link rel="STYLESHEET" href="<?php p($CFG->wwwroot) ?>/mod/voicetools/css/StyleSheet.css"" type="text/css" />
<style>
body{
@@ -191,17 +155,13 @@
}
.middle_panel{
height:315px;
-
}
html>body .middle_panel{
- height:312px;
-
+ height:319px;
}
-
</style>
-
- <div style="border:solid 1px #808080;width:700px;height:400px;margin-left:20%;margin-top:5%">
+<div style="border:solid 1px #808080;width:700px;height:400px;margin-left:20%;margin-top:5%">
<div class="headerBar" id="headerBar">
<table cellpadding="0" cellspacing="0" width=100%>
<tbody>
@@ -215,65 +175,58 @@
</div>
<div class="contextBar" id="contextBar">
<table>
- <tbody>
- <tr>
- <td class="contextBarLeft" align="left">
- <label class="nameElement">
- <?php
- $completeName=explode(" - ", $voicetool->name);
- $name=$completeName[1];
- echo substr($name,0,25);
-
- ?>
- </label>
-
- </td>
- <td class="contextBarRight" align="right">Voice Tools</td>
- </tr>
- </tbody>
- </table>
+ <tbody>
+ <tr>
+ <td class="contextBarLeft" align="left">
+ <label class="nameElement">
+ <?php echo substr($strname,0,25);?>
+ </label>
+ </td>
+ <td class="contextBarRight" align="right">Voice Tools</td>
+ </tr>
+ </tbody>
+ </table>
</div>
- <div >
+ <div>
<table width=100% class="middle_panel">
<tbody>
<tr valign=middle align=center>
- <td>
- <?php if($preview==false){
- echo get_string ('activity_tools_not_available', 'voicetools');
- }else{
- ?>
- <script>
- startVoiceBoard();
- </script>
- <?php echo get_string ('vtpopupshouldappear.1', 'voicetools');?>
- <a href="javascript:startVoiceBoard ('<?php echo "$CFG->wwwroot/course/view.php?id=$course->id" ?>');">
- <?php echo get_string ('vtpopupshouldappear.2', 'voicetools');?>
- </a>
- <?php echo get_string ('vtpopupshouldappear.3', 'voicetools');?>
- <?php }?>
- </td>
+ <td>
+ <?php if($vtpreview==false)
+ ...
[truncated message content] |
|
From: <tro...@us...> - 2008-02-14 23:22:22
|
Revision: 243
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=243&view=rev
Author: trollinger
Date: 2008-02-14 15:22:21 -0800 (Thu, 14 Feb 2008)
Log Message:
-----------
-add more log
-fix minor issue
-Refactoring
Modified Paths:
--------------
branches/team/Thomas/moodle/mod/voicetools/config.html
branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css
branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php
branches/team/Thomas/moodle/mod/voicetools/index.php
branches/team/Thomas/moodle/mod/voicetools/lang/en/voicetools.php
branches/team/Thomas/moodle/mod/voicetools/lang/en_utf8/voicetools.php
branches/team/Thomas/moodle/mod/voicetools/lang/fr/voicetools.php
branches/team/Thomas/moodle/mod/voicetools/lang/fr_utf8/voicetools.php
branches/team/Thomas/moodle/mod/voicetools/lib.php
branches/team/Thomas/moodle/mod/voicetools/manageAction.php
branches/team/Thomas/moodle/mod/voicetools/mod.html
branches/team/Thomas/moodle/mod/voicetools/view.php
branches/team/Thomas/moodle/mod/voicetools/voicerecorder.php
branches/team/Thomas/moodle/mod/voicetools/welcome.php
Modified: branches/team/Thomas/moodle/mod/voicetools/config.html
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/config.html 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/config.html 2008-02-14 23:22:21 UTC (rev 243)
@@ -1,35 +1,47 @@
<?php
if(isset($CFG->voicetools_servername))
-$servername=$CFG->voicetools_servername;
+{
+ $servername=$CFG->voicetools_servername;
+}
else
-$servername="";
+{
+ $servername="";
+}
if(isset($CFG->voicetools_adminusername))
-$adminusername=$CFG->voicetools_adminusername;
+{
+ $adminusername=$CFG->voicetools_adminusername;
+}
else
-$adminusername="";
+{
+ $adminusername="";
+}
if(isset($CFG->voicetools_adminpassword))
-$adminpassword=$CFG->voicetools_adminpassword;
+{
+ $adminpassword=$CFG->voicetools_adminpassword;
+}
else
-$adminpassword="";
+{
+ $adminpassword="";
+}
?>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <title>Voice Tools Server Configuration </title>
-
+ <title>Voice Tools Server Configuration </title>
</head>
+
<style>
- .label_settings
+.label_settings
{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size:12px;
text-align:right;
}
- .comment
+.comment
{
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size:10px;
@@ -44,6 +56,7 @@
vertical-align: middle;
}
</style>
+
<body>
<form method="post" action="module.php" name="form">
<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
@@ -52,7 +65,7 @@
<table cellpadding="9" cellspacing="0" width=800px>
<tr>
<td width="2%">
- <img src="<?php echo $CFG->wwwroot;?>/mod/voicetools/pictures/items/voice_tools.png" border="0" />
+ <img src="<?php echo $CFG->wwwroot;?>/mod/voicetools/lib/web/pictures/items/voice_tools.png" border="0" />
</td>
<td align="left" class="page_title">
<?php print_string('serverconfiguration', 'voicetools')?>
@@ -115,9 +128,25 @@
<?php p(VOICETOOLS_MODULE_VERSION) ?>
</td>
</tr>
+ <tr>
+ <td align="right">
+ <label class="label_settings"><?php echo get_string("loglevel", "voicetools");?></label>
+ </td>
+ <td align="left">
+ <select size="1" name="log_level">
+ <option value=1 <?php if (@$CFG->voicetools_log_level == 1) echo "selected"; ?>>DEBUG</option>
+ <option value=2 <?php if (!isset($CFG->voicetools_log_level) || @$CFG->voicetools_log_level == 2) echo "selected"; ?>>INFO</option>
+ <option value=3 <?php if (@$CFG->voicetools_log_level == 3) echo "selected"; ?>>WARN</option>
+ <option value=4 <?php if (@$CFG->voicetools_log_level == 4) echo "selected"; ?>>ERROR</option>
+ </select>
+ <a href=<?php echo $CFG->wwwroot."/mod/voicetools/log.php?action=list"; ?> onclick="document.forms['logs_form'].submit();"><?php echo get_string("viewlogs", "voicetools");?></a>
+ </form>
+ </td>
+ </tr>
</table>
</td>
</tr>
+
<tr>
<td colspan="3" align="center">
<input type="submit" value="<?php print_string('savechanges') ?>" />
Modified: branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/css/StyleSheet.css 2008-02-14 23:22:21 UTC (rev 243)
@@ -577,9 +577,9 @@
/*MessageBar*/
-#messageBar
+#message
{
- width:700px;
+ width:699px;
}
.message
@@ -696,7 +696,7 @@
font-size: 12px;
}
-div.advancedPopup {
+div.advancedPopup,div.informationPopup {
position:absolute;
left:0px;
top:0px;
@@ -706,9 +706,18 @@
font-family:Verdana;
padding: 2px;
margin: 2px;
+
+ display:none;
+}
+
+div.advancedPopup {
left: 15%;
+ top: 20%;
+}
+
+div.informationPopup {
+ left: 40%;
top: 30%;
- display:none;
}
div.window-left {
@@ -737,7 +746,7 @@
top:0px;
width:10px;
height:150px;
- background-image: url( "../pictures/items/window-right.png" );
+ background-image: url( "../lib/web/pictures/items/window-right.png" );
background-repeat:none;
}
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-02-14 23:22:21 UTC (rev 243)
@@ -28,95 +28,112 @@
******************************************************************************/
/* $Id: getXmlChoicePage.php 52853 2007-08-24 17:55:26Z thomasr $ */
- global $CFG;
- require_once("../../config.php");
- require_once("lib.php");
- require_once("lib/php/common/WimbaXml.php");
- require_once("lib/php/common/WimbaCommons.php");
- require_once("lib/php/common/WimbaLib.php");
- if (version_compare(PHP_VERSION,'5','>=')) {
- require_once('lib/php/common/domxml-php4-php5.php');
- }
+global $CFG;
+require_once("../../config.php");
+require_once("lib.php");
+require_once("lib/php/common/WimbaXml.php");
+require_once("lib/php/common/WimbaCommons.php");
+require_once("lib/php/common/WimbaLib.php");
+if (version_compare(PHP_VERSION,'5','>=')) {
+ require_once('lib/php/common/domxml-php4-php5.php');
+}
+
+set_error_handler("manage_error");
+
+foreach(getKeysOfGeneralParameters() as $param){
+ $value=optional_param($param["value"],$param["default_value"],$param["type"]);
+ if($value!=null)
+ {
+ $params[$param["value"]] = $value;
+ }
+}
+
+wimba_add_log(WIMBA_DEBUG,WV,"getXmlListPanel : parameters \n" . print_r($params,true));
+
+require_login($params["enc_course_id"]);
+
+$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
+$xml=new WimbaXml();
+$session=new WimbaMoodleSession($params);
+
+if($session->error==false)//no error
+{
+ /********
+ HEADER
+ *********/
+ $xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "true", "true");
+ /********
+ SESSION
+ *********/
+ $xml->CreateInformationElement($session->timeOfLoad,
+ $session->hparams["firstname"],
+ $session->hparams["lastname"],
+ $session->hparams["email"],
+ $session->hparams["role"],
+ $session->hparams["course_id"],
+ $session->signature,"");
+ /************
+ INFORMATIONS
+ *************/
+ $xml->addContextBarElement(get_string('new_tool','voicetools'));
+ /***************
+ PRODUCTS CHOICE
+ ****************/
+ $xml->addProductChoice("lib/web/pictures/buttons/new-createvoiceboard.png",
+ get_string('new_board', 'voicetools'),
+ get_string('VoiceBoardDescription', 'voicetools'),
+ "javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','board','all','".$createWorkflow."')");
- foreach(getKeysOfGeneralParameters() as $param){
- $value=optional_param($param["value"],$param["default_value"],$param["type"]);
- if($value!=null)
- {
- $params[$param["value"]] = $value;
- }
- }
+
+ $xml->addProductChoice("lib/web/pictures/buttons/new-createvoicepresentation.png",
+ get_string('new_presentation', 'voicetools'),
+ get_string('VoicePresentationDescription', 'voicetools'),
+ "javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','presentation','all','".$createWorkflow."')");
- require_login($params["enc_course_id"]);
- $createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
- $xml=new WimbaXml();
- $session=new WimbaMoodleSession($params);
+ $xml->addProductChoice("lib/web/pictures/buttons/new-createpodcaster.png",
+ get_string('new_podcaster', 'voicetools'),
+ get_string('PodcasterDescription', 'voicetools'),
+ "javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','pc','all','".$createWorkflow."')");//for 3.1
- if($session->error==false)//no error
- {
- /********
- HEADER
- *********/
- $xml->addHeaderElement("lib/web/pictures/items/headerbar-logo.png", "true", "true");
- /********
- SESSION
- *********/
- $xml->CreateInformationElement($session->timeOfLoad,
- $session->hparams["firstname"],
- $session->hparams["lastname"],
- $session->hparams["email"],
- $session->hparams["role"],
- $session->hparams["course_id"],
- $session->signature,"");
- /************
- INFORMATIONS
- *************/
- $xml->addContextBarElement(get_string('new_tool','voicetools'));
-
- /***************
- PRODUCTS CHOICE
- ****************/
- $xml->addProductChoice("lib/web/pictures/buttons/new-createvoiceboard.png",
- get_string('new_board', 'voicetools'),
- get_string('VoiceBoardDescription', 'voicetools'),
- "javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','board','all','".$createWorkflow."')");
-
+ /***************
+ VALIDATION BAR
+ ****************/
+ $actionParameters = array("value"=>get_string('cancel', 'voicetools'),
+ "style"=>"action",
+ "action"=>"launchAjaxRequest");
- $xml->addProductChoice("lib/web/pictures/buttons/new-createvoicepresentation.png",
- get_string('new_presentation', 'voicetools'),
- get_string('VoicePresentationDescription', 'voicetools'),
- "javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','presentation','all','".$createWorkflow."')");
-
- $xml->addProductChoice("lib/web/pictures/buttons/new-createpodcaster.png",
- get_string('new_podcaster', 'voicetools'),
- get_string('PodcasterDescription', 'voicetools'),
- "javascript:loadNewSettings('getXmlNewPanel.php','create' ,'voicetools','pc','all','".$createWorkflow."')");//for 3.1
-
- /***************
- VALIDATION BAR
- ****************/
- $actionParameters = array("value"=>get_string('cancel', 'voicetools'),
- "style"=>"action",
- "action"=>"launchAjaxRequest");
-
- if($createWorkflow==true)
- {
- $xml->createValidationButtonElement(get_string("validationElement_cancel", "voicetools"),
- "action",
- "javascript:redirectToActivity('manageAction.php','redirection','','".$createWorkflow."')",
- "setting_Cancel");
- }
- else
- {
- $xml->createValidationButtonElement(get_string("validationElement_cancel", "voicetools"),
- "action",
- "javascript:launchAjaxRequest('getXmlListPanel.php','',true,'all')",
- "setting_Cancel");
- }
-
- }else
- { //bad session
- $xml->setError(get_string ($session->error, 'voicetools'));
+ if($createWorkflow==true)
+ {
+ $xml->createValidationButtonElement(get_string("validationElement_cancel", "voicetools"),
+ "action",
+ "javascript:redirectToActivity('manageAction.php','redirection','','".$createWorkflow."')",
+ "setting_Cancel");
}
+ else
+ {
+ $xml->createValidationButtonElement(get_string("validationElement_cancel", "voicetools"),
+ "action",
+ "javascript:launchAjaxRequest('getXmlListPanel.php','',true,'all')",
+ "setting_Cancel");
+ }
+
+}
+else
+{ //bad session
+ wimba_add_log(WIMBA_ERROR,WV,"getChoicePanel : ". get_string ($session->error, 'voicetools'));
+ $xml->setError(get_string ($session->error, 'voicetools'));
+}
+
+wimba_add_log(WIMBA_DEBUG,WV,"getChoicePanel : xml generated \n". $xml->getXml());
+
+if(isset($error_wimba))//error fatal was detected
+{
+ $uiManager->setError(get_string ('error_display', 'voicetools'));
+}
+else
+{
echo $xml->getXml();
+}
+
?>
\ No newline at end of file
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-02-14 23:22:21 UTC (rev 243)
@@ -46,6 +46,8 @@
require_once('lib/php/common/domxml-php4-php5.php');
}
+set_error_handler("manage_error");
+
$messageProduct=optional_param("messageProduct","");
$messageAction=optional_param("messageAction","");
@@ -58,24 +60,41 @@
require_login($params["enc_course_id"]);
$uiManager=new WimbaUI($params);
-if(isset($params["error"]) )
+wimba_add_log(WIMBA_DEBUG,WV,"getXmlListPanel : parameters \n" . print_r($params,true));
+
+if(isset($params["error"]))
{
+ wimba_add_log(WIMBA_ERROR,WV,"getXmlListPanel : ". get_string ($params["error"], 'voicetools'));
$uiManager->setError(get_string ($params["error"], 'voicetools'));
}
else
{
//Session Management
- if($uiManager->getSessionError()==false)//good
- {
- $message="";
- if(!empty($messageProduct) && !empty($messageAction))
- $message=get_string("message_".$messageProduct."_start", "voicetools")." ".get_string("message_".$messageAction."_end","voicetools");
- $uiManager->getVTPrincipalView($message);
- }
- else
- { //bad session
- $uiManager->setError(get_string ('error_'.$uiManager->getError(), 'voicetools'));
- }
+ if($uiManager->getSessionError()==false)//good
+ {
+ $message="";
+ if(!empty($messageProduct) && !empty($messageAction))
+ {
+ $message=get_string("message_".$messageProduct."_start", "voicetools")." ".
+ get_string("message_".$messageAction."_end","voicetools");
+ }
+ $uiManager->getVTPrincipalView($message);
+ }
+ else
+ { //bad session
+ wimba_add_log(WIMBA_ERROR,WV,"getXmlListPanel : ". get_string ('error_'.$uiManager->getError(), 'voicetools'));
+ $uiManager->setError(get_string ('error_'.$uiManager->getError(), 'voicetools'));
+ }
}
-echo $uiManager->getXmlString();
+
+wimba_add_log(WIMBA_DEBUG,WV,"getXmlListPanel : xml generated \n". $uiManager->getXmlString());
+
+if(isset($error_wimba))//error fatal was detected
+{
+ $uiManager->setError(get_string ('error_display', 'voicetools'));
+}
+else
+{
+ echo $uiManager->getXmlString();
+}
?>
\ No newline at end of file
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlNewPanel.php 2008-02-14 23:22:21 UTC (rev 243)
@@ -31,73 +31,85 @@
/// This page is to generate the list of VT
- global $CFG;
- require_once("../../config.php");
- require_once("lib.php");
- require_once("lib/php/vt/WimbaVoicetoolsAPI.php");
- require_once("lib/php/vt/WimbaVoicetools.php");
- require_once("lib/php/common/WimbaCommons.php");
- require_once("lib/php/common/WimbaXml.php");
- require_once("lib/php/common/WimbaUI.php");
- require_once("lib/php/common/WimbaLib.php");
- if (version_compare(PHP_VERSION,'5','>=')) {
- require_once('lib/php/common/domxml-php4-php5.php');
+global $CFG;
+require_once("../../config.php");
+require_once("lib.php");
+require_once("lib/php/vt/WimbaVoicetoolsAPI.php");
+require_once("lib/php/vt/WimbaVoicetools.php");
+require_once("lib/php/common/WimbaCommons.php");
+require_once("lib/php/common/WimbaXml.php");
+require_once("lib/php/common/WimbaUI.php");
+require_once("lib/php/common/WimbaLib.php");
+if (version_compare(PHP_VERSION,'5','>=')) {
+ require_once('lib/php/common/domxml-php4-php5.php');
+}
+
+set_error_handler("manage_error");
+
+$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
+foreach(getKeysOfGeneralParameters() as $param)
+{
+ $value=optional_param($param["value"],$param["default_value"],$param["type"]);
+ if($value!=null)
+ {
+ $params[$param["value"]] = $value;
}
+}
+wimba_add_log(WIMBA_DEBUG,WV,"getXmlListPanel : parameters \n" . print_r($params,true));
+require_login($params["enc_course_id"]);
+
+$uiManager=new WimbaUI($params);
+if($uiManager->getSessionError()==false)
+{
+ /*******************
+ GET URL INFORMATIONS
+ ********************/
+ $action = optional_param('action', ""); // Course Module ID, or
+ $typeProduct = $params['type'];
- $createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
- foreach(getKeysOfGeneralParameters() as $param)
- {
- $value=optional_param($param["value"],$param["default_value"],$param["type"]);
- if($value!=null)
+ if($action == 'update')
+ { //get the information of the resource
+ $currentBoard = voicetools_api_get_resource($params["resource_id"]);
+
+ if($currentBoard==null || $currentBoard->error==true)
{
- $params[$param["value"]] = $value;
+ wimba_add_log(WIMBA_ERROR,WV,"getXmlNewPanel : ". get_string('problem_vt','voicetools'));
+ $uiManager->setError(get_string('problem_vt','voicetools'));
}
- }
- require_login($params["enc_course_id"]);
- $uiManager=new WimbaUI($params);
-
- if($uiManager->getSessionError()==false)
- {
- /*******************
- GET URL INFORMATIONS
- ********************/
- $action = optional_param('action', ""); // Course Module ID, or
- $typeProduct = $params['type'];
- add_to_log($uiManager->getSession()->getCourseId(), "voicetools", "xml", "product" , $typeProduct);
-
- if($action == 'update')
- { //get the information of the resource
- $currentBoard = voicetools_api_get_resource($params["resource_id"]);
-
- if($currentBoard==null || $currentBoard->error==true)
- {
- $uiManager->setError(get_string('problem_vt','voicetools'));
- }
-
- $currentBoardInformations=voicetools_get_voiceboard_Informations($params["resource_id"]);
- // print_r($currentBoardInformations);
- if($currentBoard->error==true)
- {
- $uiManager->setError(get_string('problem_bd','voicetools'));
- }
-
- $uiManager->setCurrentProduct($typeProduct,$currentBoard,$currentBoardInformations);
-
- }
- else
+ $currentBoardInformations=voicetools_get_voiceboard_Informations($params["resource_id"]);
+ // print_r($currentBoardInformations);
+ if($currentBoard->error==true)
{
- $uiManager->setCurrentProduct($typeProduct);
+ wimba_add_log(WIMBA_ERROR,WV,"getXmlNewPanel : ". get_string('problem_bd','voicetools'));
+ $uiManager->setError(get_string('problem_bd','voicetools'));
}
- $display= $uiManager->getVTSettingsView($action,$createWorkflow);
+ $uiManager->setCurrentProduct($typeProduct,$currentBoard,$currentBoardInformations);
}
else
{
- $uiManager->setError(get_string ($uiManager->getSessionError(), 'voicetools'));
+ $uiManager->setCurrentProduct($typeProduct);
}
+ $display= $uiManager->getVTSettingsView($action,$createWorkflow);
+
+}
+else
+{
+ wimba_add_log(WIMBA_ERROR,WV,"getXmlNewPanel : ". get_string ('error_'.$uiManager->getError(), 'voicetools'));
+ $uiManager->setError(get_string ('error_'.$uiManager->getSessionError(), 'voicetools'));
+}
+wimba_add_log(WIMBA_DEBUG,WV,"getXmlListPanel : parameters \n" . $uiManager->getXmlString());
+
+if(isset($error_wimba))//error fatal was detected
+{
+ $uiManager->setError(get_string ('error_display', 'voicetools'));
+}
+else
+{
echo $uiManager->getXmlString();
+}
?>
Modified: branches/team/Thomas/moodle/mod/voicetools/index.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/index.php 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/index.php 2008-02-14 23:22:21 UTC (rev 243)
@@ -35,21 +35,21 @@
require_once("lib/php/common/WimbaLib.php");
$course_id = optional_param('id', 0, PARAM_INT); // course
-$createWorkflow = optional_param('createWorkflow', "false", PARAM_ALPHA); // course
+$createWorkflow = optional_param('createWorkflow', false, PARAM_BOOL); // course
-if (! $course = get_record("course", "id", $course_id)) {
- error("Course ID is incorrect");
+if (! $course = get_record("course", "id", $course_id))
+{
+ error("Course ID is incorrect");
}
require_login($course->id);
-add_to_log($course->id, "voicetool", "view all", "index.php?id=$course->id", "");
-
$strvoicetools = get_string("modulenameplural", "voicetools");
$strvoicetool = get_string("modulename", "voicetools");
$navigation = array();
-if ($course->id != SITEID) {
+if ($course->id != SITEID)
+{
$navigation[$course->shortname] = "$CFG->wwwroot/course/view.php?id=$course->id";
}
$navigation[$strvoicetools] = "";
@@ -70,7 +70,10 @@
$url_params = get_url_params($course->id);
//create the url which all the parameters needed
-$url="welcome.php?id=".$course->id."&".$url_params."&time=".time()."&createWorkflow=".$createWorkflow;
+$url="welcome.php?id=".$course->id.
+ "&".$url_params.
+ "&time=".time().
+ "&createWorkflow=".$createWorkflow;
?>
<br>
Modified: branches/team/Thomas/moodle/mod/voicetools/lang/en/voicetools.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lang/en/voicetools.php 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/lang/en/voicetools.php 2008-02-14 23:22:21 UTC (rev 243)
@@ -54,6 +54,9 @@
$string['Invalid account/secret'] = 'The account/password you entered is not acknowledged by the server. Please, click Continue and verify the values you entered match with the values in the Voice Tools Server.';
$string['integrationversion'] = 'Integration Version';
$string['vtversion'] = 'Voice Tools Version';
+$string['loglevel'] = 'Set Log Level:';
+$string['viewlogs'] = 'View Logs...';
+
$string["launch_calendar"]="Launch the Voice ";
$string["voicetoolstype"]="Associated Voice Tool:";
$string["activity_name"]="Activity Name:";
Modified: branches/team/Thomas/moodle/mod/voicetools/lang/en_utf8/voicetools.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lang/en_utf8/voicetools.php 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/lang/en_utf8/voicetools.php 2008-02-14 23:22:21 UTC (rev 243)
@@ -54,6 +54,9 @@
$string['Invalid account/secret'] = 'The account/password you entered is not acknowledged by the server. Please, click Continue and verify the values you entered match with the values in the Voice Tools Server.';
$string['integrationversion'] = 'Integration Version';
$string['vtversion'] = 'Voice Tools Version';
+$string['loglevel'] = 'Set Log Level:';
+$string['viewlogs'] = 'View Logs...';
+
$string["launch_calendar"]="Launch the Voice ";
$string["voicetoolstype"]="Associated Voice Tool:";
$string["activity_name"]="Activity Name:";
@@ -107,7 +110,7 @@
$string['private_comment']='Student cannot view other student\'s discussion threads';
$string['comment_slide']= "Student can comment the slides";
$string['private_slide']= "Make slide comments private";
- $string['private_slide_comment']= "Students cannot view other student's comments";
+$string['private_slide_comment']= "Students cannot view other student's comments";
$string['view_other_thread']="Student can view other student\'s discussion threads" ;
$string['post_delay']= "Podcast auto-published after : ";
@@ -156,10 +159,10 @@
$string['presentation'] = 'Voice Presentation - ';
$string['VoicePresentation'] = 'Voice Presentation';
$string['voicepresentations'] = 'Voice Presentations';
- $string['podcaster'] = 'Wimba Podcaster';
- $string['Podcaster'] = 'Wimba Podcaster';
- $string['podcasters'] = 'Podcasters';
- $string['pc'] = 'Podcaster - ';
+$string['podcaster'] = 'Wimba Podcaster';
+$string['Podcaster'] = 'Wimba Podcaster';
+$string['podcasters'] = 'Podcasters';
+$string['pc'] = 'Podcaster - ';
$string['settings']="Settings";
$string['archivesession'] = 'Archive Sessions';
$string['new']="New";
@@ -423,7 +426,6 @@
$string['tooltipVT_1_student'] = "Available to students";
$string['configuration_test_vt_failed_sentence_start1'] = "The test of your Voice Tools server configuration settings was unsuccessful.";
$string['configuration_test_vt_successful_sentence'] = "The test of your Voice Tools server configuration settings was successful.
-
The configuration settings have been saved.";
$string['configuration_test_vtfailedAccount'] = "Please check the account name and the password s and retry.";
$string['configuration_test_vtfailedConnection'] = "Please check the Voice Tools Server Url parameters and retry.";
Modified: branches/team/Thomas/moodle/mod/voicetools/lang/fr/voicetools.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lang/fr/voicetools.php 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/lang/fr/voicetools.php 2008-02-14 23:22:21 UTC (rev 243)
@@ -43,6 +43,9 @@
$string['integrationversion'] = 'Version du module d\'Integration';
$string['emptyAdminUsername'] = 'Nom d\'Utilisateur Administrateur vide';
$string['emptyAdminPassword'] = 'Mot de Passe Administrateur vide';
+$string['loglevel'] = 'Choisissez de niveau de Log:';
+$string['viewlogs'] = 'Voir les Logs...';
+
$string['unlimited'] = 'Unlimited';
$string['wrongconfigurationURLunavailable'] = 'Configuration incorrecte, l\'URL n\'est pas disponible. Plus d\'information est disponible dans les journaux d\'erreurs';
$string['wrongconfigurationURLincorrect'] = 'Configuration incorrecte, l\'URL est incorrecte. Plus d\'information est disponible dans les journaux d\'erreurs';
Modified: branches/team/Thomas/moodle/mod/voicetools/lang/fr_utf8/voicetools.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lang/fr_utf8/voicetools.php 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/lang/fr_utf8/voicetools.php 2008-02-14 23:22:21 UTC (rev 243)
@@ -43,6 +43,9 @@
$string['integrationversion'] = 'Version du module d\'Integration';
$string['emptyAdminUsername'] = 'Nom d\'Utilisateur Administrateur vide';
$string['emptyAdminPassword'] = 'Mot de Passe Administrateur vide';
+$string['loglevel'] = 'Choisissez de niveau de Log:';
+$string['viewlogs'] = 'Voir les Logs...';
+
$string['unlimited'] = 'Unlimited';
$string['wrongconfigurationURLunavailable'] = 'Configuration incorrecte, l\'URL n\'est pas disponible. Plus d\'information est disponible dans les journaux d\'erreurs';
$string['wrongconfigurationURLincorrect'] = 'Configuration incorrecte, l\'URL est incorrecte. Plus d\'information est disponible dans les journaux d\'erreurs';
Modified: branches/team/Thomas/moodle/mod/voicetools/lib.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-02-14 23:22:21 UTC (rev 243)
@@ -28,14 +28,20 @@
/* $Id: lib.php 56815 2007-12-04 15:08:45Z thomasr $ */
/// Library of functions and constants for module voicetools
+if (!function_exists('getKeysOfGeneralParameters')) {
+ require_once('lib/php/common/WimbaLib.php');
+}
require_once($CFG->libdir.'/datalib.php');
require_once($CFG->dirroot.'/course/lib.php');
require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
-require_once('lib/php/common/WimbaCommons.php');
+
+
+
define("VOICETOOLS_MODULE_VERSION", "3.1.2");
-$VOICETOOLS_LOGS = "logs.php"; //file use to the logs
+define("WV", "voicetools");
+
/**
* Validate the data in passed in the configuration page
* @param $config - the information from the form mod.html
@@ -53,27 +59,32 @@
if(empty($config->servername))
{
+ wimba_add_log(WIMBA_ERROR,WV,get_string('wrongconfigurationURLunavailable', 'voicetools'));
error(get_string('wrongconfigurationURLunavailable', 'voicetools'), $_SERVER["HTTP_REFERER"]);
}
if(empty($config->adminusername))
{
- error(get_string('emptyAdminUsername', 'voicetools'), $_SERVER["HTTP_REFERER"]);
+ wimba_add_log(WIMBA_ERROR,WV,get_string('emptyAdminUsername', 'voicetools'));
+ error(get_string('emptyAdminUsername', 'voicetools'), $_SERVER["HTTP_REFERER"]);
}
if(empty($config->adminpassword))
{
- error(get_string('emptyAdminPassword', 'voicetools'), $_SERVER["HTTP_REFERER"]);
+ wimba_add_log(WIMBA_ERROR,WV,get_string('emptyAdminPassword', 'voicetools'));
+ error(get_string('emptyAdminPassword', 'voicetools'), $_SERVER["HTTP_REFERER"]);
}
if ($config->servername{strlen($config->servername)-1} == '/')
{
- error(get_String('trailingSlash', 'voicetools'), $_SERVER["HTTP_REFERER"]);
+ wimba_add_log(WIMBA_ERROR,WV,get_String('trailingSlash', 'voicetools'));
+ error(get_String('trailingSlash', 'voicetools'), $_SERVER["HTTP_REFERER"]);
}
-
+
if (!preg_match('/^http:\/\//', $config->servername) && !preg_match('/^https:\/\//', $config->servername))
{
- error(get_String('trailingHttp', 'voicetools'), $_SERVER["HTTP_REFERER"]);
+ wimba_add_log(WIMBA_ERROR,WV,get_String('trailingHttp', 'voicetools'));
+ error(get_String('trailingHttp', 'voicetools'), $_SERVER["HTTP_REFERER"]);
}
//check if the api account filled is correct and allowed
@@ -83,12 +94,18 @@
{
if(get_string($result, 'voicetools' ) == "[[]]")
{//the error description is not in the bundle
+ wimba_add_log(WIMBA_ERROR,WV,$result);
error($result, 'javascript:history.back();');
}
else{
+ wimba_add_log(WIMBA_ERROR,WV,get_String($result, 'voicetools'));
error(get_string($result, 'voicetools' ), 'javascript:history.back();');
}
}
+ //to make sure that all the necessary module are installed
+ wimba_add_log(WIMBA_INFO,WV,"php info :\n" .print_r(get_loaded_extensions(),true));
+
+ wimba_add_log(WIMBA_INFO,WV,"The module is well configured");
}
function voicetools_add_instance($voicetool) {
@@ -97,6 +114,8 @@
/// will create a new instance and return the id number
/// of the new instance.
global $USER;
+ print_r($voicetool);
+
//get the resource information(type and id)
list($rid, $type) = explode(";", $voicetool->resource);
@@ -104,7 +123,9 @@
$voicetool->rid=$rid;
$voicetool->name=get_string("$type","voicetools").$voicetool->name;
- if (!$voicetool->id = insert_record('voicetools', $voicetool)) {
+ if (!$voicetool->id = insert_record('voicetools', $voicetool))
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to add a new instance");
return false;
}
@@ -112,7 +133,10 @@
{
voicetools_addCalendarEvent($voicetool);
}
-
+
+ wimba_add_log(WIMBA_INFO,WV,"Add Instance".$voicetool->id);
+ //for the debug
+ wimba_add_log(WIMBA_DEBUG,WV,print_r($voicetool, true ));
return $voicetool->id;
}
@@ -120,166 +144,177 @@
/// Given an object containing all the necessary data,
/// (defined by the form in mod.html) this function
/// will update an existing instance with new data.
- global $USER;
+ global $USER;
+
+ //get the course_module instance linked to the liveclassroom instance
+ if (! $cm = get_coursemodule_from_instance("voicetools", $voicetool->instance, $voicetool->course))
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to update the instance : ".$voicetool->instance);
+ error("Course Module ID was incorrect");
+ }
+
+ if($voicetool->section != $cm->section)//the scetion has changed
+ {
+ //Find the right section in the course_section
+ if (!$section = get_record("course_sections", "id", $cm->section))
+ {
+ return false;
+ }
+ //delete in the course section
+ if (! delete_mod_from_section($cm->id, $cm->section))
+ {
+ return false;
+ }
+
+ //update the course module section
+ if (! $sectionid = add_mod_to_section($voicetool) )
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to update the instance : ".$voicetool->instance);
+ error("Could not add the new course module to that section");
+ }
+ //update the course modules
+ if (! set_field("course_modules", "section", $sectionid, "id", $cm->id))
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to update the instance : ".$voicetool->instance);
+ error("Could not update the course module with the correct section");
+ }
+ }
- //get the course_module instance linked to the liveclassroom instance
- if (! $cm = get_coursemodule_from_instance("voicetools", $voicetool->id, $voicetool->course))
- {
- error("Course Module ID was incorrect");
- }
-
- if($voicetool->section != $cm->section)//the scetion has changed
- {
- //Find the right section in the course_section
- if (!$section = get_record("course_sections", "id", $cm->section))
- {
- return false;
- }
- //delete in the course section
- if (! delete_mod_from_section($cm->id, $cm->section))
- {
- return false;
- }
-
- //update the course module section
- if (! $sectionid = add_mod_to_section($voicetool) )
- {
- error("Could not add the new course module to that section");
- }
- //update the course modules
- if (! set_field("course_modules", "section", $sectionid, "id", $cm->id))
- {
- error("Could not update the course module with the correct section");
- }
- }
-
- list($rid, $type) = explode(";", $voicetool->resource);
- $voicetool->timemodified = time();
- $voicetool->id = $voicetool->instance;
- $voicetool->rid=$rid;
- $voicetool->name=get_string("$type","voicetools").$voicetool->name;
-
- if (!$voicetool->id = update_record('voicetools', $voicetool))
- {
+ list($rid, $type) = explode(";", $voicetool->resource);
+ $voicetool->timemodified = time();
+ $voicetool->id = $voicetool->instance;
+ $voicetool->rid=$rid;
+ $voicetool->name=get_string("$type","voicetools").$voicetool->name;
+
+ if (!$voicetool->id = update_record('voicetools', $voicetool))
+ {
return false;
- }
-
- if(isset($voicetool->calendar_event) && $voicetool->calendar_event==true)
- {//no problem
- voicetools_addCalendarEvent($voicetool,$voicetool->id );
- }
- else
- {
- voicetools_deleteCalendarEvent($voicetool->id );
- }
-
- return $voicetool->id ;
+ }
+
+ if(isset($voicetool->calendar_event) && $voicetool->calendar_event==true)
+ {//no problem
+ voicetools_addCalendarEvent($voicetool,$voicetool->id );
+ }
+ else
+ {
+ voicetools_deleteCalendarEvent($voicetool->id );
+ }
+
+ wimba_add_log(WIMBA_INFO,WV,"Update of the instance : ".$voicetool->id);
+ return $voicetool->id ;
}
function voicetools_delete_instance($id) {
- /// Given an ID of an instance of this module,
- /// this function will permanently delete the instance
- /// and any data that depends on it.
- $result = true;
- if (! $voicetool = get_record("voicetools", "id", "$id"))
- {
- return false;
- }
- # Delete any dependent records here #
- if (! $instanceNumber=delete_records("voicetools", "id", "$voicetool->id"))
- {
- add_to_log($voicetool->course, "voicetools", "Delete activity",voicetools_send_logs("errorDeleteInstance","voicetoolsId=".$instanceNumber), "Activity ".$voicetool->name." deletion failed");
- $result = false;
- }
-
- voicetools_deleteCalendarEvent("$voicetool->id");
- // delete the related calendar event
+ /// Given an ID of an instance of this module,
+ /// this function will permanently delete the instance
+ /// and any data that depends on it.
+ $result = true;
+ if (! $voicetool = get_record("voicetools", "id", $id))
+ {
+ return false;
+ }
+ # Delete any dependent records here #
+ if (! $instanceNumber=delete_records("voicetools", "id", $voicetool->id))
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to delete the instance : ".$voicetool->id);
+ $result = false;
+ }
+
+ voicetools_deleteCalendarEvent($voicetool->id);
+ // delete the related calendar event
- return $result;
+ return $result;
}
function voicetools_addCalendarEvent($activity_informations){
- global $CFG;
-
- //get some complementary of the resource
- $resource=get_record('voicetools_resources','rid',$activity_informations->rid);
-
- $event = new Object();
- $event->name = $activity_informations->name;
- $event->description = $activity_informations->description."<br><a href=".$CFG->wwwroot."/mod/voicetools/view.php?id=".$activity_informations->id."&action=launchCalendar target=_self >".get_string("launch_calendar","voicetools").$resource->type." ...</a>";
- $event->format = 1;
- $event->userid = 0;
- $event->courseid = $activity_informations->course; //course event
- $event->groupid = 0;
- $event->modulename = 'voicetools';
- $event->instance = $activity_informations->id;
- $event->eventtype = '';
- $event->visible = 1;
- $event->timemodified = time();
-
- if($activity_informations->course_format !="weeks" && $activity_informations->course_format !="weekscss")
- {//tppics or social
- $event->timestart = mktime($activity_informations->start_hr,$activity_informations->start_min,0,$activity_informations->start_month,$activity_informations->start_day,$activity_informations->start_year);
- if( $event->timestart < time())
- {
- error(get_string("date_error","voicetools"),$_SERVER["HTTP_REFERER"]);
- }
- }
- else
- {
- $event->timestart = mktime($activity_informations->start_hr,$activity_informations->start_min,0,date('m',$activity_informations->calendar_start),date('d',$activity_informations->calendar_start),date('Y',$activity_informations->calendar_start));
- }
-
- $duration = $informations->duration_hr*3600 + $informations->duration_min*60;
- if ($duration < 0)
- {
- $event->timeduration = 0;
- }
- else
- {
- $event->timeduration = $duration;
- }
-
- if(!$oldEvent=get_record('event','instance',$activity_informations->id)) //old event exsit
- {
- $event->id = $oldEvent->id ;
- $result=update_record('event', $event);
- }
- else
- {
- $result = insert_record('event', $event);
- }
- return $result;
+ global $CFG;
+ //get some complementary of the resource
+ $resource=get_record('voicetools_resources','rid',$activity_informations->rid);
+
+ $event = new Object();
+ $event->name = $activity_informations->name;
+ $event->description = $activity_informations->description."<br><a href=".$CFG->wwwroot."/mod/voicetools/view.php?id=".$activity_informations->id."&action=launchCalendar target=_self >".get_string("launch_calendar","voicetools").$resource->type." ...</a>";
+ $event->format = 1;
+ $event->userid = 0;
+ $event->courseid = $activity_informations->course; //course event
+ $event->groupid = 0;
+ $event->modulename = 'voicetools';
+ $event->instance = $activity_informations->id;
+ $event->eventtype = '';
+ $event->visible = 1;
+ $event->timemodified = time();
+
+ if($activity_informations->course_format !="weeks" && $activity_informations->course_format !="weekscss")
+ {//tppics or social
+ $event->timestart = mktime($activity_informations->start_hr,$activity_informations->start_min,0,$activity_informations->start_month,$activity_informations->start_day,$activity_informations->start_year);
+ if( $event->timestart < time())
+ {
+ error(get_string("date_error","voicetools"),$_SERVER["HTTP_REFERER"]);
+ }
+ }
+ else
+ {
+ $event->timestart = mktime($activity_informations->start_hr,$activity_informations->start_min,0,date('m',$activity_informations->calendar_start),date('d',$activity_informations->calendar_start),date('Y',$activity_informations->calendar_start));
+ }
+
+ $duration = $activity_informations->duration_hr*3600 + $activity_informations->duration_min*60;
+ if ($duration < 0)
+ {
+ $event->timeduration = 0;
+ }
+ else
+ {
+ $event->timeduration = $duration;
+ }
+
+ wimba_add_log(WIMBA_DEBUG,WV,"Add calendar event\n".print_r($event, true ));
+
+ $oldEvent=get_record('event','instance',$activity_informations->id);
+ if(!empty($oldEvent) && $oldEvent!=false) //old event exsit
+ {
+ $event->id = $oldEvent->id ;
+ $result=update_record('event', $event);
+ }
+ else
+ {
+ $result = insert_record('event', $event);
+ }
+
+ return $result;
}
function voicetools_deleteCalendarEvent($instanceNumber){
/// Basic event record for the database.
- global $CFG;
-
- if(!$event=get_record('event','instance',$instanceNumber)){
- return false;
- }
- $result=delete_records("event", "id", $event->id);
+ global $CFG;
+
+ if(!$event=get_record('event','instance',$instanceNumber))
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to delete calendar event : ".$instanceNumber);
+ return false;
+ }
+ $result=delete_records("event", "id", $event->id);
}
function voicetools_delete_resource($rid) {
- /// Given an ID of an instance of this module,
- /// this function will permanently delete the instance
- /// and any data that depends on it.
-
- if (! $voicetool = get_record("voicetools_resources", "rid", $rid)) {
- return false;
- }
- # Delete any dependent records here #
- if (! delete_records("voicetools_resources", "id", "$voicetool->id")) {
- return false;
- }
+ /// Given an ID of an instance of this module,
+ /// this function will permanently delete the instance
+ /// and any data that depends on it.
+
+ if (! $voicetool = get_record("voicetools_resources", "rid", $rid)) {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to delete a resource : ".$rid);
+ return false;
+ }
+ # Delete any dependent records here #
+ if (! delete_records("voicetools_resources", "id", "$voicetool->id")) {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to delete a resource : ".$rid);
+ return false;
+ }
- return true;
+ return true;
}
function voicetools_user_outline($course, $user, $mod, $voicetool) {
@@ -288,8 +323,7 @@
/// Used for user activity reports.
/// $return->time = the time they did it
/// $return->info = a short text description
-
- return $return;
+ return $return;
}
function voicetools_user_complete($course, $user, $mod, $voicetool) {
@@ -395,37 +429,41 @@
/// and any data that depends on it.
//delete the resource of the vt list
- voicetools_delete_resource($id);
+
$result = true;
-
- if ($voicetools = get_records("voicetools", "rid", $id)) {
-
+ wimba_add_log(WIMBA_INFO,WV,"Delete the resouce ". $id);
+ if ($voicetools = get_records("voicetools", "rid", $id))
+ {
# Delete any dependent records here #
- foreach($voicetools as $voicetool){
+ foreach($voicetools as $voicetool){
//get the course_module instance linked to the liveclassroom instance
- if(! $cm = get_coursemodule_from_instance("voicetools", $voicetool->id, $voicetool->course)) {
- error("Course Module ID was incorrect");
+ $cm=get_coursemodule_from_instance("voicetools", $voicetool->id, $voicetool->course);
+
+ if(!empty($cm)) //old event exsit
+ {
+ if (! delete_course_module($cm->id))
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to delete the course module : ".$cm->id);
+ $result = false;
+ //Delete a course module and any associated data at the course level (events)
+ }
+ //delete the instance
+ if (! delete_records("voicetools", "id", $voicetool->id))
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to delete all the activities associated to the voice tools");
+ $result = false;
+ }
+ //delete in the course section too
+ if (! delete_mod_from_section($cm->id, $cm->section))
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Could not delete the ".$cm->id." from that section : ".$cm->section);
+ $result = false;
+ }
+ voicetools_deleteCalendarEvent($voicetool->id);
}
-
- if (! delete_course_module($cm->id)) {
- add_to_log($voicetool->course, "voicetools", voicetools_send_logs("errorDeleteAllcm","rid=".$voicetool->id."&cm=".$cm->id), "Delete all activities", "Could not delete the ".$cm->id." (coursemodule)");
- $result = false;
- //Delete a course module and any associated data at the course level (events)
- // notify("Could not delete the $cm->id (coursemodule)");
- }
- //delete the instance
- if (! delete_records("voicetools", "id", $voicetool->id)) {
- add_to_log($liveclassrooms->course, "voicetools", voicetools_send_logs("errorDeleteAlldb","id=".$voicetool->id), "Delete all activities", "All activities associated to the vocie tools have not been deleted from the voice tools database");
- $result = false;
- }
- //delete in the course section too
- if (! delete_mod_from_section($cm->id, "$cm->section")) {
- add_to_log($voicetool->course, "voicetools", voicetools_send_logs("errorDeleteAllsection","rid=".$voicetool->id."&cm=".$cm->id."§ion=".$cm->section), "Delete all activities", "Could not delete the ".$cm->id." from that section");
- $result = false;
- }
}
}
-
+ voicetools_delete_resource($id);
return $result;
}
@@ -438,27 +476,31 @@
*/
function voicetools_get_voicetools_list($courseId) {
$tools_list = get_records('voicetools_resources','course',$courseId);
- $result= array();
- $result["rid"]= array();
- $result["info"]= array();
-
- if(empty($tools_list)){
- return null;
-
-
+ $result= array();
+ $result["rid"]= array();
+ $result["info"]= array();
+
+ if(empty($tools_list))
+ {
+ wimba_add_log(WIMBA_INFO,WV,"No resources have been created yet");
+ return null;
}
- else if($tools_list == false) {
- error( "Response get_board_list : query to database failed");
- return "error_moodleDatabase";
+ else if($tools_list == false)
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to get the list of resources");
+ error( "Response get_board_list : query to database failed");
+ return "error_moodleDatabase";
}
$result = array();
foreach($tools_list as $tool) {
-
- if($tool->type!="recorder"){
- $result["rid"][]= $tool->rid;
- $result["info"][$tool->rid]= $tool;
- }
+ if($tool->type!="recorder")
+ {
+ $result["rid"][]= $tool->rid;
+ $result["info"][$tool->rid]= $tool;
+ }
}
+ wimba_add_log(WIMBA_DEBUG,WV,"list of resource :\n".print_r($result, true ));
+
return $result;
}
@@ -470,38 +512,47 @@
function voicetools_get_voicetool_informations($rid) {
$tool = get_record('voicetools_resources','rid',$rid);
-
+
if(empty($tool))
{
- return null;
+ wimba_add_log(WIMBA_INFO,WV,"No resources have been created yet");
+ return null;
}
else if($tool == false)
{
- error( "Response get_board_list : query to database failed");
- return "error_moodleDatabase";
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to get the list of resources");
+ error( "Response get_board_list : query to database failed");
+ return "error_moodleDatabase";
}
-
+ wimba_add_log(WIMBA_DEBUG,WV,"list of resource :\n".print_r($tool, true ));
+
return $tool;
}
function vocietools_get_recorder_rid($courseId) {
- $tools_list = get_records('voicetools_resources','course',$courseId);
-
- if(empty($tools_list)){
- return NULL;
-
- }
- else if($tools_list == false) {
- error( "Response get_board_list : query to database failed");
- return "error_moodleDatabase";
- }
- $result = array();
- foreach($tools_list as $tool) {
- if($tool->type=="recorder")
- return $tool->rid;
-
- }
- return NULL;
+ $tools_list = get_records('voicetools_resources','course',$courseId);
+
+ if(empty($tools_list))
+ {
+ wimba_add_log(WIMBA_INFO,WV,"No resources have been created yet");
+ return NULL;
+ }
+ else if($tools_list == false)
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to get the list of resources");
+ error( "Response get_board_list : query to database failed");
+ return "error_moodleDatabase";
+ }
+
+ $result = array();
+ foreach($tools_list as $tool) {
+ if($tool->type=="recorder")
+ {
+ wimba_add_log(WIMBA_DEBUG,WV,$tool->rid ." : rid of the recorder for the course ".$courseId);
+ return $tool->rid;
+ }
+ }
+ return NULL;
}
@@ -512,13 +563,12 @@
*/
function voicetools_get_voiceboard_Informations($rid) {
+ if(!($board_informations = get_record('voicetools_resources','rid',$rid)))
+ {
+ error( "Response get_board_list : query to database failed");
+ return "error_moodleDatabase";
+ }
- if(!($board_informations = get_record('voicetools_resources','rid',$rid))) {
- error( "Response get_board_list : query to database failed");
- return "error_moodleDatabase";
- }
-
-
return $board_informations;
}
@@ -532,7 +582,6 @@
*/
function voicetools_get_event_calendar($id) {
-
$event = get_record('event','instance',$id);
if($event==false || empty($event)) {
@@ -543,74 +592,62 @@
function voicetools_update_recorder_informations($blockId,$comment,$title) {
- $oldRecorder = get_record('voicetools_recorder','bid',$blockId);
- if($oldRecorder==false){
-
- return false;
- }else if(empty($oldRecorder)) { //no data saved before
+ $oldRecorder = get_record('voicetools_recorder','bid',$blockId);
+ if($oldRecorder==false)
+ {
+ wimba_add_log(WIMBA_ERROR,WV,"Problem to get the recorder information");
+ return false;
+ }
+ else if(empty($oldRecorder))
+ { //no data saved before
+ $recorder->bid=$blockId;
+ $recorder->comment= $comment;
+ $recorder->title=$title;
+ $id=insert_record("voicetools_recorder", $recorder);
+ }
+ else
+ {
+ $oldRecorder->title = $title;
+ $oldRecorder->comment = $comment;
+ $id=update_record("voicetools_recorder", $oldRecorder);
+ }
+ return $id;
+}
- $recorder->bid=$blockId;
- $recorder->comment= $comment;
- $recorder->title=$title;
-
- $id=insert_record("voicetools_recorder", $recorder);
-
- }else{
- $oldRecorder->title = $title;
- $oldRecorder->comment = $comment;
- $id=update_record("voicetools_recorder", $oldRecorder);
- }
- return $id;
-}
function voicetools_get_recorder_informations($blockId) {
- $recorder = get_record('voicetools_recorder','bid',$blockId);
- if($recorder==false || empty($recorder)) {
-
- $recorder->bid=$blockId;
- $recorder->comment= "Description";
- $recorder->title="Announcement";
-
- $id=insert_record("voicetools_recorder", $recorder);
-
- }
- $recorder = get_record('voicetools_recorder','bid',$blockId);
- if($recorder==false || empty($recorder)) {
-
- return false;
+ $recorder = get_record('voicetools_recorder','bid',$blockId);
+ if($recorder==false || empty($recorder))
+ {
+ $recorder->bid=$blockId;
+ $recorder->comment= "Description";
+ $recorder->title="Announcement";
+ $id=insert_record("voicetools_recorder", $recorder);
+ }
+
+ $recorder = get_record('voicetools_recorder','bid',$blockId);
+ if($recorder==false || empty($recorder))
+ {
+ return false;
}
- return $recorder;
+ wimba_add_log(WIMBA_DEBUG,WV,"Recorder informations : \n".print_r($recorder, true ));
+ return $recorder;
}
function voicetools_get_version() {
- $answer = voicetools_api_get_version();
-
- if (!strcmp($answer, "error")) {
- return get_string('voicetools', "error");
- }
- elseif (!strcmp($answer, 'unknown')) {
- return get_string('voicetools', 'unknown');
- }
-
- return $answer;
+ $answer = voicetools_api_get_version();
+
+ if (!strcmp($answer, "error"))
+ {
+ return get_string('voicetools', "error");
+ }
+ elseif (!strcmp($answer, 'unknown'))
+ {
+ return get_string('voicetools', 'unknown');
+ }
+
+ return $answer;
}
-/*
-* Send info to the logs system
-* @param $type : type of the log
-* @param $parameters : string with the parameters needed
-* return a string which is the link to the logs file
-*/
-function voicetools_send_logs($type,$parameters) {
-
- global $VOICETOOLS_LOGS;
-
-
- $link = $VOICETOOLS_LOGS."?type=$type";
- $link .= "&$parameters";
- $link .= "&time=".time();
-
- return $link;
-}
?>
Modified: branches/team/Thomas/moodle/mod/voicetools/manageAction.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/manageAction.php 2008-02-14 23:21:43 UTC (rev 242)
+++ branches/team/Thomas/moodle/mod/voicetools/manageAction.php 2008-02-14 23:22:21 UTC (rev 243)
@@ -42,14 +42,15 @@
$messageAction=optional_param("messageAction","");
$notool=optional_param("novoicetools","false");
$createWorkflow = optional_param("createWorkflow", false, PARAM_BOOL); // course
-
+
$keys=array_merge(getKeysOfGeneralParameters(),getKeyWimbaVoiceForm());
foreach($keys as $param){
$value=optional_param($param["value"],$param["default_value"],$param["type"]);
if($value!=null)
$params[$param["value"]] = $value;
-}
+}
+wimba_add_log(WIMBA_DEBUG,WV,"manageAction : parameters \n" . print_r($params,true));
require_login($params["enc_course_id"]);
$vtAction = new vtAction($params);
@@ -64,15 +65,19 @@
$messageType = "";
if ($session->error == false && $session != NULL ) {
- if ($params['action'] == 'launch') {
+ if ($params['action'] == 'launch')
+ {
$session->setCurrentVtUSer($params["type"]);
- if ($params["studentView"] == "true") {
+
+ if ($params["studentView"] == "true")
+ {
$session->setVtUserRigths($params["type"], "student");
}
$resource = voicetools_api_get_resource($params["resource_id"]);
$result = $vtAction->getVtSession($resource, $session->getVtUser(), $session->getVtUserRigths());
if ($result != NULL)
{
+ wimba_add_log(WIMBA_DEBUG,WV,"launch the ". $params["type"] . ", nid =" .$result->getNid());
redirection($CFG->voicetools_servername . '/' . $params["type"] . '?action=display_popup&nid=' . $result->getNid());
}
else
@@ -100,23 +105,20 @@
$messageAction = "created";
$messageProduct = "pc";
}
-
+
if ($result != NULL && $result->error != "error")
{
- $params["resource_id"] = storeResource($result->getRid(), $params);
-
- if (empty ($params["resource_id"]))
+ $resource_id = storeResource($result->getRid(), $session->getCourseId(), $params);
+
+ if (empty ($resource_id))
{
- error_log(__FUNCTION__ . " : Problem to add the new resource on the database", TRUE);
+ wimba_add_log(WIMBA_ERROR,WV,"manageAction : Problem to add the resource into the database");
redirection($redirectionUrl. '&error=problem_bd');
}
- if(VTAPI_DEBUG) {
- error_log(__FUNCTION__ . " : Board Created and added on the database, rid=" . $result->getRid(), TRUE);
- }
}
else
{
- error_log(__FUNCTION__ . " : Problem to add the new resource on the vt server", TRUE);
+ wimba_add_log(WIMBA_ERROR,WV,"manageAction :Problem ...
[truncated message content] |
|
From: <tro...@us...> - 2008-02-15 19:09:15
|
Revision: 245
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=245&view=rev
Author: trollinger
Date: 2008-02-15 11:09:14 -0800 (Fri, 15 Feb 2008)
Log Message:
-----------
fix a problem related to the update of an existing event
Modified Paths:
--------------
branches/team/Thomas/moodle/mod/voicetools/lang/en/voicetools.php
branches/team/Thomas/moodle/mod/voicetools/lang/en_utf8/voicetools.php
branches/team/Thomas/moodle/mod/voicetools/lib.php
branches/team/Thomas/moodle/mod/voicetools/mod.html
Modified: branches/team/Thomas/moodle/mod/voicetools/lang/en/voicetools.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lang/en/voicetools.php 2008-02-15 19:08:40 UTC (rev 244)
+++ branches/team/Thomas/moodle/mod/voicetools/lang/en/voicetools.php 2008-02-15 19:09:14 UTC (rev 245)
@@ -26,7 +26,7 @@
* *
******************************************************************************/
-/* $Id: voicetools.php 51391 2007-07-16 21:10:29Z thomasr $ */
+/* $Id: voicetools.php 56777 2007-12-03 21:38:57Z thomasr $ */
$string['modulename'] = 'Wimba Voice Tool';
$string['modulenameplural'] = 'Wimba Voice Tools';
@@ -64,6 +64,12 @@
$string["weeksformat"]="Week:";
$string["activity_tools_not_available"]="The Voice Tools linked to this activity is currently unavailable.<br>Please contact your instructor";
$string["activity_manageTools"]="Manage Voice Tools";
+
+$string['addactivity'] = 'Add an Activity';
+$string['or'] = "or";
+$string['visibletostudents'] = "Visible to students:";
+$string['in'] = "in";
+
//tab name
$string['board_info'] = 'Info';
$string['media'] = 'Media';
@@ -104,7 +110,7 @@
$string['private_comment']='Student cannot view other student\'s discussion threads';
$string['comment_slide']= "Student can comment the slides";
$string['private_slide']= "Make slide comments private";
- $string['private_slide_comment']= "Students cannot view other student's comments";
+$string['private_slide_comment']= "Students cannot view other student's comments";
$string['view_other_thread']="Student can view other student\'s discussion threads" ;
$string['post_delay']= "Podcast auto-published after : ";
@@ -153,10 +159,10 @@
$string['presentation'] = 'Voice Presentation - ';
$string['VoicePresentation'] = 'Voice Presentation';
$string['voicepresentations'] = 'Voice Presentations';
- $string['podcaster'] = 'Wimba Podcaster';
- $string['Podcaster'] = 'Wimba Podcaster';
- $string['podcasters'] = 'Podcasters';
- $string['pc'] = 'Podcaster - ';
+$string['podcaster'] = 'Wimba Podcaster';
+$string['Podcaster'] = 'Wimba Podcaster';
+$string['podcasters'] = 'Podcasters';
+$string['pc'] = 'Podcaster - ';
$string['settings']="Settings";
$string['archivesession'] = 'Archive Sessions';
$string['new']="New";
@@ -420,7 +426,6 @@
$string['tooltipVT_1_student'] = "Available to students";
$string['configuration_test_vt_failed_sentence_start1'] = "The test of your Voice Tools server configuration settings was unsuccessful.";
$string['configuration_test_vt_successful_sentence'] = "The test of your Voice Tools server configuration settings was successful.
-
The configuration settings have been saved.";
$string['configuration_test_vtfailedAccount'] = "Please check the account name and the password s and retry.";
$string['configuration_test_vtfailedConnection'] = "Please check the Voice Tools Server Url parameters and retry.";
Modified: branches/team/Thomas/moodle/mod/voicetools/lang/en_utf8/voicetools.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lang/en_utf8/voicetools.php 2008-02-15 19:08:40 UTC (rev 244)
+++ branches/team/Thomas/moodle/mod/voicetools/lang/en_utf8/voicetools.php 2008-02-15 19:09:14 UTC (rev 245)
@@ -57,7 +57,7 @@
$string['loglevel'] = 'Set Log Level:';
$string['viewlogs'] = 'View Logs...';
-$string["launch_calendar"]="Launch the Voice ";
+$string["launch_calendar"]="Launch the Wimba ";
$string["voicetoolstype"]="Associated Voice Tool:";
$string["activity_name"]="Activity Name:";
$string["topicformat"]="Topic:";
Modified: branches/team/Thomas/moodle/mod/voicetools/lib.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-02-15 19:08:40 UTC (rev 244)
+++ branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-02-15 19:09:14 UTC (rev 245)
@@ -131,7 +131,7 @@
if(isset($voicetool->calendar_event) && $voicetool->calendar_event==true)
{
- voicetools_addCalendarEvent($voicetool);
+ voicetools_addCalendarEvent($voicetool,$voicetool->id);
}
wimba_add_log(WIMBA_INFO,WV,"Add Instance".$voicetool->id);
@@ -193,7 +193,7 @@
if(isset($voicetool->calendar_event) && $voicetool->calendar_event==true)
{//no problem
- voicetools_addCalendarEvent($voicetool,$voicetool->id );
+ voicetools_addCalendarEvent($voicetool,$voicetool->instance);
}
else
{
@@ -228,20 +228,21 @@
}
-function voicetools_addCalendarEvent($activity_informations){
- global $CFG;
+function voicetools_addCalendarEvent($activity_informations,$instanceNumber){
+ global $CFG;
+
//get some complementary of the resource
$resource=get_record('voicetools_resources','rid',$activity_informations->rid);
$event = new Object();
$event->name = $activity_informations->name;
- $event->description = $activity_informations->description."<br><a href=".$CFG->wwwroot."/mod/voicetools/view.php?id=".$activity_informations->id."&action=launchCalendar target=_self >".get_string("launch_calendar","voicetools").$resource->type." ...</a>";
+ $event->description = $activity_informations->description."<br><a href=".$CFG->wwwroot."/mod/voicetools/view.php?id=".$activity_informations->id."&action=launchCalendar target=_self >".get_string("launch_calendar","voicetools").get_string($resource->type,"voicetools")." ...</a>";
$event->format = 1;
$event->userid = 0;
$event->courseid = $activity_informations->course; //course event
$event->groupid = 0;
$event->modulename = 'voicetools';
- $event->instance = $activity_informations->id;
+ $event->instance = $instanceNumber;
$event->eventtype = '';
$event->visible = 1;
$event->timemodified = time();
Modified: branches/team/Thomas/moodle/mod/voicetools/mod.html
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-02-15 19:08:40 UTC (rev 244)
+++ branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-02-15 19:09:14 UTC (rev 245)
@@ -95,15 +95,11 @@
$event=voicetools_get_event_calendar($activity->id);
if($event==true)
{
+ $disableAllElements="";
$checked ="checked";
list($description,$link)=split("<br>",$event->description);
$stringDate=date('m',$event->timestart)."/".date('d',$event->timestart)."/".date('Y',$event->timestart);
}
- else
- {
- $disableAllElements="disabled";
- }
-
$completeName=explode(" - ", $activity->name);
$name=$completeName[1];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tro...@us...> - 2008-02-18 19:22:58
|
Revision: 246
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=246&view=rev
Author: trollinger
Date: 2008-02-18 11:22:56 -0800 (Mon, 18 Feb 2008)
Log Message:
-----------
add a missing file "popup.php"
Modified Paths:
--------------
branches/team/Thomas/moodle/mod/voicetools/lib.php
branches/team/Thomas/moodle/mod/voicetools/mod.html
Added Paths:
-----------
branches/team/Thomas/moodle/mod/voicetools/popup.php
Modified: branches/team/Thomas/moodle/mod/voicetools/lib.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-02-15 19:09:14 UTC (rev 245)
+++ branches/team/Thomas/moodle/mod/voicetools/lib.php 2008-02-18 19:22:56 UTC (rev 246)
@@ -35,9 +35,6 @@
require_once($CFG->dirroot.'/course/lib.php');
require_once('lib/php/vt/WimbaVoicetoolsAPI.php');
-
-
-
define("VOICETOOLS_MODULE_VERSION", "3.1.2");
define("WV", "voicetools");
Modified: branches/team/Thomas/moodle/mod/voicetools/mod.html
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-02-15 19:09:14 UTC (rev 245)
+++ branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-02-18 19:22:56 UTC (rev 246)
@@ -39,17 +39,17 @@
require_once($CFG->dirroot.'/version.php');
//test if the current user can see this page
-require_login($course->id);
+require_login($course->id);
if (!isteacher($course->id, $USER->id)) { //to Be sure
- error("You need to be a teacher in this course to create an instance");
+ error("You need to be a teacher in this course to create an instance");
}
-
+
//get the required parameters
$course_id = optional_param('id', 0, PARAM_INT);
$resource_id = optional_param('rid',null, PARAM_RAW);
$update = optional_param('update', null, PARAM_INT);
$sectionId = optional_param('section', null, PARAM_INT);
-
+
/// First we check that form variables have been initialised
if (!isset($form->name))
{
@@ -80,19 +80,19 @@
$disableAllElements="disabled";
//check if a calendar event exist
if(isset($update)){ //update
-
- //get the information of the activity
- if (! $cmVT = get_record("course_modules", "id", $update))
+
+ //get the information of the activity
+ if (! $cmVT = get_record("course_modules", "id", $update))
{
- return false;
- }
- $course_id=$cmVT->course;
-
- $activity = get_record("voicetools", "id", $cmVT->instance );
- $sectionId=$activity->section;
- $resource_id = $activity->rid;
+ return false;
+ }
+ $course_id=$cmVT->course;
+
+ $activity = get_record("voicetools", "id", $cmVT->instance );
+ $sectionId=$activity->section;
+ $resource_id = $activity->rid;
- $event=voicetools_get_event_calendar($activity->id);
+ $event=voicetools_get_event_calendar($activity->id);
if($event==true)
{
$disableAllElements="";
@@ -100,12 +100,12 @@
list($description,$link)=split("<br>",$event->description);
$stringDate=date('m',$event->timestart)."/".date('d',$event->timestart)."/".date('Y',$event->timestart);
}
- $completeName=explode(" - ", $activity->name);
+ $completeName=explode(" - ", $activity->name);
$name=$completeName[1];
}
else
{//new
- $checked ="";
+ $checked ="";
$name="";
if($course->format == "weeks" && $sectionId == 0)
@@ -121,39 +121,39 @@
}
//manage the state of the calendar form
-//it is disabled for the Introduction section (week 0) of a weekly course
+//it is disabled for the Introduction section (week 0) of a weekly course
if($course->format == "weeks" || $course->format == "weekscss" && $sectionId != 0)
{
- $disabledCheckbox="disabled";
- $eventDate=mktime(0,0,0,1,date('z',$course->startdate)+($sectionId-1)*7+1,date('y',$course->startdate)) ;
- $stringDate=date('m',$eventDate)."/".date('d',$eventDate)."/".date('Y',$eventDate);
+ $disabledCheckbox="disabled";
+ $eventDate=mktime(0,0,0,1,date('z',$course->startdate)+($sectionId-1)*7+1,date('y',$course->startdate)) ;
+ $stringDate=date('m',$eventDate)."/".date('d',$eventDate)."/".date('Y',$eventDate);
}
else
{
- $disabledCheckbox="";
-}
+ $disabledCheckbox="";
+}
// Visible to students or not
if ($form->coursemodule)
{
- $visible = get_field('course_modules', 'visible', 'id', $form->coursemodule);
+ $visible = get_field('course_modules', 'visible', 'id', $form->coursemodule);
}
else
{
- $visible = true;
+ $visible = true;
}
if ($form->mode == 'add') { // in this case $form->section is the section number, not the id
- $hiddensection = !get_field('course_sections', 'visible', 'section', $form->section, 'course', $form->course);
+ $hiddensection = !get_field('course_sections', 'visible', 'section', $form->section, 'course', $form->course);
}
else
{
- $hiddensection = !get_field('course_sections', 'visible', 'id', $form->section);
+ $hiddensection = !get_field('course_sections', 'visible', 'id', $form->section);
}
if ($hiddensection)
{
- $visible = false;
+ $visible = false;
}
//get the list of resource available
@@ -161,232 +161,224 @@
$vtResources=voicetools_api_get_resources($resourcesRid["rid"]);
if($vtResources==null)
{
- $error=true;
+ $error=true;
}
-
+
?>
<link rel="STYLESHEET" href="<?php p($CFG->wwwroot) ?>/mod/voicetools/css/StyleSheet.css"" type="text/css" />
<style>
body
{
- font-size:14px;
+ font-size:14px;
}
.content
{
- margin:-5px;
+ margin:-5px;
}
-.jY0YJb {
-background-color:#C3D9FF;
-border:3px solid #C3D9FF;
-left:0pt;
-position:absolute;
-top:0pt;
-width:450px;
-z-index:501;
-}
+
</style>
-<script type="text/javascript">
+<script type="text/javascript">
//cookie management
function createCookie(name,value,days) {
- if (days) {
- var date = new Date();
- date.setTime(date.getTime()+(days*24*60*60*1000));
- var expires = "; expires="+date.toGMTString();
- }
- else var expires = "";
- document.cookie = name+"="+value+expires+"; path=/";
+ if (days) {
+ var date = new Date();
+ date.setTime(date.getTime()+(days*24*60*60*1000));
+ var expires = "; expires="+date.toGMTString();
+ }
+ else var expires = "";
+ document.cookie = name+"="+value+expires+"; path=/";
}
function readCookie(name) {
- var nameEQ = name + "=";
- var ca = document.cookie.split(';');
- for(var i=0;i < ca.length;i++)
- {
- var c = ca[i];
- while (c.charAt(0)==' '){
+ var nameEQ = name + "=";
+ var ca = document.cookie.split(';');
+ for(var i=0;i < ca.length;i++)
+ {
+ var c = ca[i];
+ while (c.charAt(0)==' '){
c = c.substring(1,c.length);
- }
- if (c.indexOf(nameEQ) == 0)
- {
+ }
+ if (c.indexOf(nameEQ) == 0)
+ {
return c.substring(nameEQ.length,c.length);
}
- }
- return null;
+ }
+ return null;
}
function deleteCookie(name) {
- createCookie(name,"",-1);
+ createCookie(name,"",-1);
}
function booleanValue(value){
- if(value=="false")
- {
- return false;
- }
- else
- {
- return true;
+ if(value=="false")
+ {
+ return false;
}
+ else
+ {
+ return true;
+ }
}
function validate(){
-
+
// name can't be null
- if(document.getElementById("name").value == "")
- {
+ if(document.getElementById("name").value == "")
+ {
alert("Please a name is required.");
return false;
- }
- else if(document.getElementById("name").value.length>=255)
- {
+ }
+ else if(document.getElementById("name").value.length>=255)
+ {
alert("Please choose an activity name that is less than 255 characters.");
return false;
- }
- else if(document.getElementById("resource").value=="empty")
- {
+ }
+ else if(document.getElementById("resource").value=="empty")
+ {
alert("Please select a Voice Tools.");
return false;
- }
+ }
document.getElementById("form").submit();
}
function TestNoTool() {
- <?php
- $listTools = voicetools_get_voicetools_list($course->id);
- if($listTools==NULL) { //no voice tools available
- wimba_add_log(WIMBA_INFO, WV, "Mod.html : no voicetools created on the course ". $course->id);
- ?>
- document.getElementById("hiddenDiv").style.height=document.documentElement.clientHeight
- document.getElementById("hiddenDiv").style.width=document.documentElement.clientWidth
- document.getElementById("popup").style.display="block";
- document.getElementById("hiddenDiv").style.display="block";
- <?php
- }
- ?>
-
+ <?php
+ $listTools = voicetools_get_voicetools_list($course->id);
+ if($listTools==NULL) { //no voice tools available
+ wimba_add_log(WIMBA_INFO, WV, "Mod.html : no voicetools created on the course ". $course->id);
+ ?>
+ document.getElementById("hiddenDiv").style.height=document.documentElement.clientHeight
+ document.getElementById("hiddenDiv").style.width=document.documentElement.clientWidth
+ document.getElementById("popup").style.display="block";
+ document.getElementById("hiddenDiv").style.display="block";
+ <?php
+ }
+ ?>
+
}
function popupCancel(){
- document.getElementById("popup").style.display="none";
- document.getElementById("hiddenDiv").style.display="none";
- location.href = "<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php p($course_id)?>";
+ document.getElementById("popup").style.display="none";
+ document.getElementById("hiddenDiv").style.display="none";
+ location.href = "<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php p($course_id)?>";
}
function popupOk(){
- document.getElementById("popup").style.display="none";
- document.getElementById("hiddenDiv").style.display="none";
- location.href = "<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $course_id;?>&createWorkflow=true";
+ document.getElementById("popup").style.display="none";
+ document.getElementById("hiddenDiv").style.display="none";
+ location.href = "<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $course_id;?>&createWorkflow=true";
}
function LaunchCreateWorkflow(){
//save the form fields
- if(document.getElementById("name")!=null)
- {
- createCookie("name",document.getElementById("name").value);
- }
-
- if(document.getElementById("section")!=null)
- {
- createCookie("section",document.getElementById("section").selectedIndex);
- }
-
- if(document.getElementById("menuvisible")!=null)
- {
- createCookie("menuvisible",document.getElementById("menuvisible").selectedIndex);
- }
- //calendar
- if(document.getElementById("calendar_event")!=null)
- {
- createCookie("calendar_event",document.getElementById("calendar_event").checked);
- }
-
- if(document.getElementById("start_month")!=null)
- {
- createCookie("start_month",document.getElementById("start_month").selectedIndex);
- }
-
- if(document.getElementById("start_day")!=null)
- {
- createCookie("start_day",document.getElementById("start_day").selectedIndex);
- }
-
- if(document.getElementById("start_year")!=null)
- {
- createCookie("start_year",document.getElementById("start_year").selectedIndex);
- }
-
- if(document.getElementById("start_hr")!=null)
- {
- createCookie("start_hr",document.getElementById("start_hr").selectedIndex);
- }
-
- if(document.getElementById("start_min")!=null)
- {
- createCookie("start_min",document.getElementById("start_min").selectedIndex);
- }
-
- if(document.getElementById("duration_hr")!=null)
- {
- createCookie("duration_hr",document.getElementById("duration_hr").selectedIndex);
- }
-
- if(document.getElementById("duration_min")!=null)
- {
- createCookie("duration_min",document.getElementById("duration_min").selectedIndex);
- }
-
- if(document.getElementById("description")!=null)
- {
- createCookie("description",document.getElementById("description").value);
- }
-
- //manage the availability of the calendar
- if(document.getElementById("calendar_event")!=null)
- {
- createCookie("calendar_event_disabled",document.getElementById("calendar_event").disabled);
- }
-
- if(document.getElementById("start_month")!=null)
- {
- createCookie("start_month_disabled",document.getElementById("start_month").disabled);
- }
-
- if(document.getElementById("start_day")!=null)
- {
- createCookie("start_day_disabled",document.getElementById("start_day").disabled);
- }
-
- if(document.getElementById("start_year")!=null)
- {
- createCookie("start_year_disabled",document.getElementById("start_year").disabled);
- }
-
- if(document.getElementById("start_hr")!=null)
- {
- createCookie("start_hr_disabled",document.getElementById("start_hr").disabled);
- }
-
- if(document.getElementById("start_min")!=null)
- {
- createCookie("start_min_disabled",document.getElementById("start_min").disabled);
- }
- if(document.getElementById("duration_hr")!=null)
- {
- createCookie("duration_hr_disabled",document.getElementById("duration_hr").disabled);
- }
-
- if(document.getElementById("duration_min")!=null)
- {
- createCookie("duration_min_disabled",document.getElementById("duration_min").disabled);
- }
-
- if(document.getElementById("description")!=null)
- {
- createCookie("description_disabled",document.getElementById("description").disabled);
+ if(document.getElementById("name")!=null)
+ {
+ createCookie("name",document.getElementById("name").value);
}
+
+ if(document.getElementById("section")!=null)
+ {
+ createCookie("section",document.getElementById("section").selectedIndex);
+ }
+
+ if(document.getElementById("menuvisible")!=null)
+ {
+ createCookie("menuvisible",document.getElementById("menuvisible").selectedIndex);
+ }
+ //calendar
+ if(document.getElementById("calendar_event")!=null)
+ {
+ createCookie("calendar_event",document.getElementById("calendar_event").checked);
+ }
+
+ if(document.getElementById("start_month")!=null)
+ {
+ createCookie("start_month",document.getElementById("start_month").selectedIndex);
+ }
+
+ if(document.getElementById("start_day")!=null)
+ {
+ createCookie("start_day",document.getElementById("start_day").selectedIndex);
+ }
+
+ if(document.getElementById("start_year")!=null)
+ {
+ createCookie("start_year",document.getElementById("start_year").selectedIndex);
+ }
+
+ if(document.getElementById("start_hr")!=null)
+ {
+ createCookie("start_hr",document.getElementById("start_hr").selectedIndex);
+ }
+
+ if(document.getElementById("start_min")!=null)
+ {
+ createCookie("start_min",document.getElementById("start_min").selectedIndex);
+ }
+
+ if(document.getElementById("duration_hr")!=null)
+ {
+ createCookie("duration_hr",document.getElementById("duration_hr").selectedIndex);
+ }
+
+ if(document.getElementById("duration_min")!=null)
+ {
+ createCookie("duration_min",document.getElementById("duration_min").selectedIndex);
+ }
+
+ if(document.getElementById("description")!=null)
+ {
+ createCookie("description",document.getElementById("description").value);
+ }
+
+ //manage the availability of the calendar
+ if(document.getElementById("calendar_event")!=null)
+ {
+ createCookie("calendar_event_disabled",document.getElementById("calendar_event").disabled);
+ }
+
+ if(document.getElementById("start_month")!=null)
+ {
+ createCookie("start_month_disabled",document.getElementById("start_month").disabled);
+ }
+
+ if(document.getElementById("start_day")!=null)
+ {
+ createCookie("start_day_disabled",document.getElementById("start_day").disabled);
+ }
+
+ if(document.getElementById("start_year")!=null)
+ {
+ createCookie("start_year_disabled",document.getElementById("start_year").disabled);
+ }
+
+ if(document.getElementById("start_hr")!=null)
+ {
+ createCookie("start_hr_disabled",document.getElementById("start_hr").disabled);
+ }
+
+ if(document.getElementById("start_min")!=null)
+ {
+ createCookie("start_min_disabled",document.getElementById("start_min").disabled);
+ }
+ if(document.getElementById("duration_hr")!=null)
+ {
+ createCookie("duration_hr_disabled",document.getElementById("duration_hr").disabled);
+ }
+
+ if(document.getElementById("duration_min")!=null)
+ {
+ createCookie("duration_min_disabled",document.getElementById("duration_min").disabled);
+ }
+
+ if(document.getElementById("description")!=null)
+ {
+ createCookie("description_disabled",document.getElementById("description").disabled);
+ }
if(document.getElementById("comment_date")!=null){
createCookie("comment_date",document.getElementById("comment_date").innerHTML);
}
@@ -395,152 +387,152 @@
function hideCalendarEvent(value){
- if(value=="check")
- {
- if(document.getElementById("calendar_event").checked==true)
- {
- value="";
- }
- else
- {
- value="disabled";
- }
- }
-
- document.getElementById("start_hr").disabled=value ;
- document.getElementById("start_min").disabled=value ;
- document.getElementById("duration_hr").disabled=value ;
- document.getElementById("duration_min").disabled=value ;
- document.getElementById("description").disabled=value;
- document.getElementById("start_day").disabled=value;
- <?php if($course->format=="topics" || $course->format == "social" || $course->format=="site" ){?>
- document.getElementById("start_month").disabled=value;
- document.getElementById("start_year").disabled=value;
- <?}?>
+ if(value=="check")
+ {
+ if(document.getElementById("calendar_event").checked==true)
+ {
+ value="";
+ }
+ else
+ {
+ value="disabled";
+ }
+ }
+
+ document.getElementById("start_hr").disabled=value ;
+ document.getElementById("start_min").disabled=value ;
+ document.getElementById("duration_hr").disabled=value ;
+ document.getElementById("duration_min").disabled=value ;
+ document.getElementById("description").disabled=value;
+ document.getElementById("start_day").disabled=value;
+ <?php if($course->format=="topics" || $course->format == "social" || $course->format=="site" ){?>
+ document.getElementById("start_month").disabled=value;
+ document.getElementById("start_year").disabled=value;
+ <?}?>
}
function change(){
- if(document.getElementById("section").value == 0)
- {
- hideCalendarEvent("disabled");
- document.getElementById("calendar_event").disabled="disabled";
- document.getElementById("comment_date").innerHTML="";
- }
- else
- {
- document.getElementById("calendar_event").disabled="";
- if(document.getElementById("calendar_event").checked==false)
- {
- hideCalendarEvent("disabled");
- }
- else
- {
+ if(document.getElementById("section").value == 0)
+ {
+ hideCalendarEvent("disabled");
+ document.getElementById("calendar_event").disabled="disabled";
+ document.getElementById("comment_date").innerHTML="";
+ }
+ else
+ {
+ document.getElementById("calendar_event").disabled="";
+ if(document.getElementById("calendar_event").checked==false)
+ {
+ hideCalendarEvent("disabled");
+ }
+ else
+ {
hideCalendarEvent("");
- }
-
- var value = parseInt("<?php echo $course->startdate ?>") +
- parseInt((document.getElementById("section").value -1) * 604800) +
- parseInt(document.getElementById("start_day").value) + 3600; //add 3600 for ie
-
- var date = new Date(value*1000);
- document.getElementById("calendar_start").value= value;
- document.getElementById("comment_date").innerHTML= (date.getMonth()+1)+"/"+ date.getDate()+"/"+date.getFullYear();
-
- }
+ }
+
+ var value = parseInt("<?php echo $course->startdate ?>") +
+ parseInt((document.getElementById("section").value -1) * 604800) +
+ parseInt(document.getElementById("start_day").value) + 3600; //add 3600 for ie
+
+ var date = new Date(value*1000);
+ document.getElementById("calendar_start").value= value;
+ document.getElementById("comment_date").innerHTML= (date.getMonth()+1)+"/"+ date.getDate()+"/"+date.getFullYear();
+
+ }
}
function FillForm(){
-
- if(document.getElementById("name")!=null && readCookie("name")!=null)
- {
- document.getElementById("name").value=[readCookie("name")];
- deleteCookie("name");
- }
-
- if(document.getElementById("section")!=null && readCookie("section")!=null)
- {
- document.getElementById("section")[readCookie("section")].selected=true;
- deleteCookie("section");
- }
-
- if(document.getElementById("menuvisible")!=null && readCookie("menuvisible")!=null)
- {
- document.getElementById("menuvisible")[readCookie("menuvisible")].selected=true;
- deleteCookie("menuvisible");
- }
-
- if(document.getElementById("calendar_event")!=null && readCookie("calendar_event")!=null)
- {
- document.getElementById("calendar_event").checked=booleanValue(readCookie("calendar_event"));
- document.getElementById("calendar_event").disabled=booleanValue(readCookie("calendar_event_disabled"));
- deleteCookie("calendar_event");
- deleteCookie("calendar_event_disabled");
- }
-
- if(document.getElementById("start_month")!=null && readCookie("start_month")!=null)
- {
- document.getElementById("start_month")[readCookie("start_month")].selected=true;
- document.getElementById("start_month").disabled=booleanValue(readCookie("start_month_disabled"));
- deleteCookie("start_month");
- deleteCookie("start_month_disabled");
- }
-
- if(document.getElementById("start_day")!=null && readCookie("start_day")!=null)
- {
- document.getElementById("start_day")[readCookie("start_day")].selected=true;
- document.getElementById("start_day").disabled=booleanValue(readCookie("start_day_disabled"));
- deleteCookie("start_day");
- deleteCookie("start_day_disabled");
- }
-
- if(document.getElementById("start_year")!=null && readCookie("start_year")!=null)
- {
- document.getElementById("start_year")[readCookie("start_year")].selected=true;
- document.getElementById("start_year").disabled=booleanValue(readCookie("start_year_disabled"));
- deleteCookie("start_year");
- deleteCookie("start_year_disabled");
- }
-
- if(document.getElementById("start_hr")!=null && readCookie("start_hr")!=null)
- {
- document.getElementById("start_hr")[readCookie("start_hr")].selected=true;
- document.getElementById("start_hr").disabled=booleanValue(readCookie("start_hr_disabled"));
- deleteCookie("start_hr");
- deleteCookie("start_hr_disabled");
- }
-
- if(document.getElementById("duration_hr")!=null && readCookie("duration_hr")!=null)
- {
- document.getElementById("duration_hr")[readCookie("duration_hr")].selected=true;
- document.getElementById("duration_hr").disabled=booleanValue(readCookie("duration_hr_disabled"));
- deleteCookie("duration_hr");
- deleteCookie("duration_hr_disabled");
- }
-
- if(document.getElementById("duration_min")!=null && readCookie("duration_min")!=null)
- {
- document.getElementById("duration_min")[readCookie("duration_min")].selected=true;
- document.getElementById("duration_min").disabled=booleanValue(readCookie("duration_min_disabled"));
- deleteCookie("duration_min");
- deleteCookie("duration_min_disabled");
- }
-
- if(document.getElementById("start_min")!=null && readCookie("start_min")!=null)
- {
- document.getElementById("start_min")[readCookie("start_min")].selected=true;
- document.getElementById("start_min").disabled=booleanValue(readCookie("start_min_disabled"));
- deleteCookie("start_min");
- deleteCookie("start_min_disabled");
- }
-
- if(document.getElementById("description")!=null && readCookie("description")!=null)
- {
- document.getElementById("description").value=readCookie("description");
- document.getElementById("description").disabled=booleanValue(readCookie("description_disabled"));
- deleteCookie("description");
- deleteCookie("description_disabled");
- }
+
+ if(document.getElementById("name")!=null && readCookie("name")!=null)
+ {
+ document.getElementById("name").value=[readCookie("name")];
+ deleteCookie("name");
+ }
+
+ if(document.getElementById("section")!=null && readCookie("section")!=null)
+ {
+ document.getElementById("section")[readCookie("section")].selected=true;
+ deleteCookie("section");
+ }
+
+ if(document.getElementById("menuvisible")!=null && readCookie("menuvisible")!=null)
+ {
+ document.getElementById("menuvisible")[readCookie("menuvisible")].selected=true;
+ deleteCookie("menuvisible");
+ }
+
+ if(document.getElementById("calendar_event")!=null && readCookie("calendar_event")!=null)
+ {
+ document.getElementById("calendar_event").checked=booleanValue(readCookie("calendar_event"));
+ document.getElementById("calendar_event").disabled=booleanValue(readCookie("calendar_event_disabled"));
+ deleteCookie("calendar_event");
+ deleteCookie("calendar_event_disabled");
+ }
+
+ if(document.getElementById("start_month")!=null && readCookie("start_month")!=null)
+ {
+ document.getElementById("start_month")[readCookie("start_month")].selected=true;
+ document.getElementById("start_month").disabled=booleanValue(readCookie("start_month_disabled"));
+ deleteCookie("start_month");
+ deleteCookie("start_month_disabled");
+ }
+
+ if(document.getElementById("start_day")!=null && readCookie("start_day")!=null)
+ {
+ document.getElementById("start_day")[readCookie("start_day")].selected=true;
+ document.getElementById("start_day").disabled=booleanValue(readCookie("start_day_disabled"));
+ deleteCookie("start_day");
+ deleteCookie("start_day_disabled");
+ }
+
+ if(document.getElementById("start_year")!=null && readCookie("start_year")!=null)
+ {
+ document.getElementById("start_year")[readCookie("start_year")].selected=true;
+ document.getElementById("start_year").disabled=booleanValue(readCookie("start_year_disabled"));
+ deleteCookie("start_year");
+ deleteCookie("start_year_disabled");
+ }
+
+ if(document.getElementById("start_hr")!=null && readCookie("start_hr")!=null)
+ {
+ document.getElementById("start_hr")[readCookie("start_hr")].selected=true;
+ document.getElementById("start_hr").disabled=booleanValue(readCookie("start_hr_disabled"));
+ deleteCookie("start_hr");
+ deleteCookie("start_hr_disabled");
+ }
+
+ if(document.getElementById("duration_hr")!=null && readCookie("duration_hr")!=null)
+ {
+ document.getElementById("duration_hr")[readCookie("duration_hr")].selected=true;
+ document.getElementById("duration_hr").disabled=booleanValue(readCookie("duration_hr_disabled"));
+ deleteCookie("duration_hr");
+ deleteCookie("duration_hr_disabled");
+ }
+
+ if(document.getElementById("duration_min")!=null && readCookie("duration_min")!=null)
+ {
+ document.getElementById("duration_min")[readCookie("duration_min")].selected=true;
+ document.getElementById("duration_min").disabled=booleanValue(readCookie("duration_min_disabled"));
+ deleteCookie("duration_min");
+ deleteCookie("duration_min_disabled");
+ }
+
+ if(document.getElementById("start_min")!=null && readCookie("start_min")!=null)
+ {
+ document.getElementById("start_min")[readCookie("start_min")].selected=true;
+ document.getElementById("start_min").disabled=booleanValue(readCookie("start_min_disabled"));
+ deleteCookie("start_min");
+ deleteCookie("start_min_disabled");
+ }
+
+ if(document.getElementById("description")!=null && readCookie("description")!=null)
+ {
+ document.getElementById("description").value=readCookie("description");
+ document.getElementById("description").disabled=booleanValue(readCookie("description_disabled"));
+ deleteCookie("description");
+ deleteCookie("description_disabled");
+ }
if(document.getElementById("comment_date")!=null && readCookie("comment_date")!=null)
{
document.getElementById("comment_date").innerHTML=readCookie("comment_date");
@@ -549,362 +541,359 @@
}
function loadPage(){
- TestNoTool();
- FillForm();
+ TestNoTool();
+ FillForm();
}
window.onload=loadPage;
</script>
-<title>Wimba</title>
-</head>
-<body>
- <div class="content" id=content width=700px align=center>
- <form name="form" id="form" method="post" action="mod.php">
- <input type="hidden" value="" name="type">
+<div class="content" id=content width=700px align=center>
+ <form name="form" id="form" method="post" action="mod.php">
+ <input type="hidden" value="" name="type">
- <div id="headerBar" width=700px align=center>
- <table cellspacing="0" cellpadding="0" width=700px align=center>
+ <div id="headerBar" width=700px align=center>
+ <table cellspacing="0" cellpadding="0" width=700px align=center>
+ <tr>
+ <td class="headerBarLeft" align="left">
+ <img alt="" src="<?php echo $CFG->wwwroot;?>/mod/voicetools/lib/web/pictures/items/headerbar-logo.png">
+ </td>
+ <td align="right" class="headerBarRight">
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="contextBar" width=700px align=center style="border-bottom: solid 1px #D9DEE5;">
+ <table width=700px align=center>
+ <tbody>
<tr>
- <td class="headerBarLeft" align="left">
- <img alt="" src="<?php echo $CFG->wwwroot;?>/mod/voicetools/lib/web/pictures/items/headerbar-logo.png">
- </td>
- <td align="right" class="headerBarRight">
+ <td class="contextBarLeft" align="left">
+ <label class= "nameElement"><?php print_string('addactivity', 'voicetools') ?></label>
+ <label class="nameTools">: Voice Tools in <?php echo $course->fullname; ?></label>
</td>
+ <td class="contextBarRight" align="right">Voice Tools</td>
</tr>
- </table>
- </div>
- <div id="contextBar" width=700px align=center style="border-bottom: solid 1px #D9DEE5;">
- <table width=700px align=center>
- <tbody>
- <tr>
- <td class="contextBarLeft" align="left">
- <label class= "nameElement"><?php print_string('addactivity', 'voicetools') ?></label>
- <label class="nameTools">: Voice Tools in <?php echo $course->fullname; ?></label>
- </td>
- <td class="contextBarRight" align="right">Voice Tools</td>
- </tr>
- </tbody>
- </table>
- </div>
- <div id="activity" width="700px" align=center>
- <table border="0" width="700px" align=center cellpadding="5" cellspacing="0">
- <tr valign="top">
- <td align="right">
- <font color="red">*</font><font class="fontCurrent"><?php print_string('activity_name', 'voicetools') ?></font>
- </td>
- <td align="left">
- <input type="text" id="name" name="name" size="25" value="<?php echo $name ?>">
- </td>
- <td colspan="2">
- <font color="red">*</font><font class="fontCurrent"><?php print_string('required_fields', 'voicetools')?></font>
- </td>
- </tr>
- <?php if($course->format == "weeks" || $course->format == "weekscss"){ ?>
- <tr valign="top">
- <td align="right">
- <font class="fontCurrent"><?php print_string('weeksformat', 'voicetools')?></font>
- </td>
- <td align="left">
- <select name="section" id="section" onchange="change()">
- <?php
- echo getListOfWeeks($course,$sectionId);
- ?>
- </select>
- </td>
- </tr>
- <?php }else if($course->format == "topics" ){ ?>
- <tr valign="top">
- <td align="right">
- <font class="fontCurrent"><?php print_string('topicformat', 'voicetools') ?></font>
- </td>
- <td colspan="2" align="left">
- <select name="section" id="section">
- <?php echo getListOfTopics($course,$sectionId); ?>
- </select>
- </td>
- </tr>
- <?php } ?>
- <tr valign="top">
- <td align="right">
- <font color="red">*</font><?php print_string('voicetoolstype', 'voicetools')?>
- </td>
-
- <td align="left"><select id="resource" name="resource">
- <option value="empty">
- Select...
- </option>
- <optgroup label="<?php echo get_string ('voiceboard', 'voicetools') ?>">
- <?php
- for($i=0;$vtResources!=null && $i<count($vtResources->getResources()) ;$i++) {
- $resource = $vtResources->getResource($i);
- if($resource->getType()=="board"){
- if (isset($resource_id) && $resource_id == $resource->getRid())
- {
- echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- else
- {
- echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- }
+ </tbody>
+ </table>
+ </div>
+ <div id="activity" width="700px" align=center>
+ <table border="0" width="700px" align=center cellpadding="5" cellspacing="0">
+ <tr valign="top">
+ <td align="right">
+ <font color="red">*</font><font class="fontCurrent"><?php print_string('activity_name', 'voicetools') ?></font>
+ </td>
+ <td align="left">
+ <input type="text" id="name" name="name" size="25" value="<?php echo $name ?>">
+ </td>
+ <td colspan="2">
+ <font color="red">*</font><font class="fontCurrent"><?php print_string('required_fields', 'voicetools')?></font>
+ </td>
+ </tr>
+ <?php if($course->format == "weeks" || $course->format == "weekscss"){ ?>
+ <tr valign="top">
+ <td align="right">
+ <font class="fontCurrent"><?php print_string('weeksformat', 'voicetools')?></font>
+ </td>
+ <td align="left">
+ <select name="section" id="section" onchange="change()">
+ <?php
+ echo getListOfWeeks($course,$sectionId);
+ ?>
+ </select>
+ </td>
+ </tr>
+ <?php }else if($course->format == "topics" ){ ?>
+ <tr valign="top">
+ <td align="right">
+ <font class="fontCurrent"><?php print_string('topicformat', 'voicetools') ?></font>
+ </td>
+ <td colspan="2" align="left">
+ <select name="section" id="Select1">
+ <?php echo getListOfTopics($course,$sectionId); ?>
+ </select>
+ </td>
+ </tr>
+ <?php } ?>
+ <tr valign="top">
+ <td align="right">
+ <font color="red">*</font><?php print_string('voicetoolstype', 'voicetools')?>
+ </td>
+
+ <td align="left"><select id="resource" name="resource">
+ <option value="empty">
+ Select...
+ </option>
+ <optgroup label="<?php echo get_string ('voiceboard', 'voicetools') ?>">
+ <?php
+ for($i=0;$vtResources!=null && $i<count($vtResources->getResources()) ;$i++)
+ {
+ $resource = $vtResources->getResource($i);
+ if($resource->getType()=="board")
+ {
+ if (isset($resource_id) && $resource_id == $resource->getRid())
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ else
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ }
- }
- ?>
- </optgroup>
- <optgroup label="<?php echo get_string ('voicepresentation', 'voicetools') ?>">
- <?php
- for($i=0;$vtResources!=null && $i<count($vtResources->getResources());$i++) {
- $resource = $vtResources->getResource($i);
- if($resource->getType()=="presentation"){
+ }
+ ?>
+ </optgroup>
+ <optgroup label="<?php echo get_string ('voicepresentation', 'voicetools') ?>">
+ <?php
+ for($i=0;$vtResources!=null && $i<count($vtResources->getResources());$i++) {
+ $resource = $vtResources->getResource($i);
+ if($resource->getType()=="presentation"){
- if (isset($resource_id) && $resource_id == $resource->getRid())
- {
- echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- else
- {
- echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- }
+ if (isset($resource_id) && $resource_id == $resource->getRid())
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ else
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ }
- }
- ?>
- </optgroup>
+ }
+ ?>
+ </optgroup>
- <optgroup label="<?php echo get_string ('podcaster', 'voicetools') ?>">
- <?php
- for($i=0;$vtResources!=null && $i<count($vtResources->getResources());$i++) {
- $resource = $vtResources->getResource($i);
- if($resource->getType()=="pc"){
+ <optgroup label="<?php echo get_string ('podcaster', 'voicetools') ?>">
+ <?php
+ for($i=0;$vtResources!=null && $i<count($vtResources->getResources());$i++) {
+ $resource = $vtResources->getResource($i);
+ if($resource->getType()=="pc")
+ {
+ if (isset($resource_id) && $resource_id == $resource->getRid())
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ else
+ {
+ echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ }
- if (isset($resource_id) && $resource_id == $resource->getRid())
- {
- echo "<option value=".$resource->getRid().";".$resource->getType()." selected >".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
- }
- else
- {
- echo "<option value=".$resource->getRid().";".$resource->getType().">".((strlen($resource->getTitle())>25)?substr($resource->getTitle(),0,25)."...":$resource->getTitle())."</option>" ;
+ }
+ ?>
+ </optgroup>
+ </select>
+ </td>
+
+ <td width="50px"><?php print_string('or', 'voicetools')?></td>
+ <td>
+ <input type="button" value="<?php print_string('new', 'voicetools')?>" onclick="javascript:LaunchCreateWorkflow()">
+ </td>
+ </tr>
+ <tr valign="top" >
+ <td align="right">
+ <font class="fontCurrent"><?php echo get_string('visibletostudents','voicetools'); ?></font>
+ </td>
+ <td align="left" >
+ <?php
+ unset($choices);
+ $choices[1] = get_string('show');
+ $choices[0] = get_string('hide');
+ choose_from_menu($choices, 'visible', $visible, '', '', 0, false, $hiddensection);
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <td height="30px">
+ </td>
+ </tr>
+ <tr>
+ <td align="right" colspan="2" width="500px">
+ <div id="calendar">
+ <table cellpadding=5 cellspacing="5" width="100%" >
+ <tr>
+ <td align=right>
+ <input type="checkbox" value="true" id="calendar_event" name="calendar_event" onclick=hideCalendarEvent("check") <?php echo $checked." ".$disabledCheckbox ?>>
+ <font class="fontCurrent"><?php echo get_string ('add_calendar', 'voicetools') ?></font>
+ </td>
+ </tr>
+
+ <tr>
+ <?php
+ if($course->format == "weeks" || $course->format == "weekscss"){?>
+ <td align=right style="width:180px">
+ <select style="float:left" id="start_day" name= "start_day" onchange="change()" <?php echo $disableAllElements ?>>
+ <?php
+ for($i=0;$i<7;$i++){
+ if($event==false && $i==0 || $event!=false && date('w',$event->timestart)==date('w',$i*86400+$course->startdate))
+ echo "<option value=".($i*86400)." selected>".get_string("day".date('w',$i*86400+$course->startdate),"voicetools")."</option>";
+ else
+ echo "<option value=".($i*86400).">".get_string("day".date('w',(($i*86400)+$course->startdate)),"voicetools")."</option>";
+ }
+ ?>
+ </select>
+ <label id="comment_date"><?php echo $stringDate;?></label>
+ </td>
+ <?
+ }else if($course->format == "topics" || $course->format == "social" || $course->format == "site"){?>
+ <td align=right style="width:240px">
+ <select id="start_month" name="start_month" <?php echo $disableAllElements ?>>
+ <?php
+ for($i=1;$i<=12;$i++){
+ if($event==false && $i==date('m') || $event!=false && date('m',$event->timestart)==$i)
+ echo "<option value=".$i." selected>".get_string("month".$i,"voicetools")."</option>";
+ else
+ echo "<option value=".$i.">".get_string("month".$i,"voicetools")."</option>";
+ }
+ ?>
+ </select>
+ <select id="Select2" name="start_day" <?php echo $disableAllElements ?>>
+ <?php
+ for($i=1;$i<=31;$i++){
+ if($event==false && $i==date('d') || $event!=false && date('d',$event->timestart)==$i)
+ echo "<option value=".$i." selected>".$i."</option>";
+ else
+ echo "<option value=".$i.">".$i."</option>";
+ }
+ ?>
+ </select>
+ <select id="start_year" name="start_year" <?php echo $disableAllElements ?>>
+ <?php
+ for($i=date('Y');$i<=date('Y')+10;$i++){
+ if($event==false && $i==date('Y') || $event!=false && date('Y',$event->timestart)==$i)
+ echo "<option value=".$i." selected>".$i."</option>";
+ else
+ echo "<option value=".$i.">".$i."</option>";
+ }
+ ?>
+ </select>
+ </td>
+ <? }?>
+ </td>
+ <td align=left >
+ <select id="start_hr" name="start_hr" <?php echo $disableAllElements ?>>
+ <?php
+ for($i=1;$i<=24;$i++){
+ if($event==false && $i==8 || $event!=false && date('G',$event->timestart)==$i)
+ echo "<option value=".$i." selected>".date("h A",mktime($i, 1, 1, 1, 1,2007))."</option>";
+ else
+ echo "<option value=".$i.">".date("h A",mktime($i, 1, 1, 1, 1,2007))."</option>";
+ }
+ ?>
+ </select>
+ <select id="start_min" name="start_min" <?php echo $disableAllElements ?>>
+ <?php
+ for($i=0;$i<60;$i=$i+5){
+ if($event!=false && date('i',$event->timestart)==$i)
+ echo "<option value=".$i." selected>".$i."</option>";
+ else
+ echo "<option value=".$i.">".$i."</option>";
}
- }
+ ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ <font class="fontCurrent"><?echo get_string('duration_calendar','voicetools')?></font>
+ </td>
+ <td align=left >
+ <select id="duration_hr" name="duration_hr" <?php echo $disableAllElements ?>>
+ <?php
+ for($i=0;$i<=24;$i++){
+ if($event!=false && intval(abs($event->timeduration/3600))==$i)
+ echo "<option value=".$i." selected>".$i."</option>";
+ else
+ echo "<option value=".$i.">".$i."</option>";
+ }
+ ?>
+ </select>
+ hr
+ <select id="duration_min" name="duration_min" <?php echo $disableAllElements ?>>
+ <?php
+ for($i=0;$i<=60;$i=$i+10){
+ if($event!=false && (($event->timeduration%3600)/60)==$i)
+ echo "<option value=".$i." selected>".$i."</option>";
+ else
+ echo "<option value=".$i.">".$i."</option>";
+ }
+ ?>
+ </select>
+ min
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ <font class="fontCurrent"><? echo get_string('description_calendar', 'voicetools')?></font>
+ </td>
+ <td align=left >
+ <textarea id="description" name="description" <?php echo $disableAllElements ?> rows="4" cols="30"><?php echo $description; ?></textarea>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div align=center width=700px>
+ <table width=700px cellpadding="5" align=center >
+ <tr style="border-top:1px solid; background-color:#F0F0F0;">
+ <td align="left"><img alt="" src="<?php echo $CFG->wwwroot;?>/mod/voicetools/lib/web/pictures/items/listitem-voicetoolsicon.gif" ><a class="list" href="<?php echo $CFG->wwwroot;?>/mod/voicetools/index.php?id=<?php echo $course_id;?>">
+ <?php print_string('activity_manageTools', 'voicetools')?></a>
+ </td>
- }
- ?>
- </optgroup>
- </select>
- </td>
+ <td align="right" class="action" onclick="self.location.href='<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php p($course_id)?>'">
+ <label><?php print_string('validationElement_cancel', 'voicetools')?></label>
+ </td>
+ <?php
+ if($update!=false)
+ $text=get_string('validationElement_saveAll', 'voicetools');
+ else
+ $text=get_string('validationElement_create', 'voicetools');
+ ?>
+
+ <td id="setting_Create" class="action" align="right" onclick="validate();">
+ <label><?php echo $text;?></label>
+ </td>
- <td width="50px"><?php print_string('or', 'voicetools')?></td>
- <td>
- <input type="button" value="<?php print_string('new', 'voicetools')?>" onclick="javascript:LaunchCreateWorkflow()">
- </td>
- </tr>
- <tr valign="top" >
- <td align="right">
- <font class="fontCurrent"><?php echo get_string('visibletostudents','voicetools'); ?></font>
- </td>
- <td align="left" >
- <?php
- unset($choices);
- $choices[1] = get_string('show');
- $choices[0] = get_string('hide');
- choose_from_menu($choices, 'visible', $visible, '', '', 0, false, $hiddensection);
- ?>
- </td>
- </tr>
- <tr>
- <td height="30px">
- </td>
- </tr>
- <tr>
- <td align="right" colspan="2" width="500px">
- <div id="calendar">
- <table cellpadding=5 cellspacing="5" width="100%" >
- <tr>
- <td align=right>
- <input type="checkbox" value="true" id="calendar_event" name="calendar_event" onclick=hideCalendarEvent("check") <?php echo $checked." ".$disabledCheckbox ?>>
- <font class="fontCurrent"><?php echo get_string ('add_calendar', 'voicetools') ?></font>
- </td>
- </tr>
-
- <tr>
- <?php
- if($course->format == "weeks" || $course->format == "weekscss"){?>
- <td align=right style="width:180px">
- <select style="float:left" id="start_day" name= "start_day" onchange="change()" <?php echo $disableAllElements ?>>
- <?php
- for($i=0;$i<7;$i++){
- if($event==false && $i==0 || $event!=false && date('w',$event->timestart)==date('w',$i*86400+$course->startdate))
- echo "<option value=".($i*86400)." selected>".get_string("day".date('w',$i*86400+$course->startdate),"voicetools")."</option>";
- else
- echo "<option value=".($i*86400).">".get_string("day".date('w',(($i*86400)+$course->startdate)),"voicetools")."</option>";
- }
- ?>
- </select>
- <label id="comment_date"><?php echo $stringDate;?></label>
- </td>
- <?
- }else if($course->format == "topics" || $course->format == "social" || $course->format == "site"){?>
- <td align=right style="width:240px">
- <select id="start_month" name="start_month" <?php echo $disableAllElements ?>>
- <?php
- for($i=1;$i<=12;$i++){
- if($event==false && $i==date('m') || $event!=false && date('m',$event->timestart)==$i)
- echo "<option value=".$i." selected>".get_string("month".$i,"voicetools")."</option>";
- else
- echo "<option value=".$i.">".get_string("month".$i,"voicetools")."</option>";
- }
- ?>
- </select>
- <select id="start_day" name="start_day" <?php echo $disableAllElements ?>>
- <?php
- ...
[truncated message content] |
|
From: <tro...@us...> - 2008-02-19 22:27:58
|
Revision: 249
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=249&view=rev
Author: trollinger
Date: 2008-02-19 14:27:56 -0800 (Tue, 19 Feb 2008)
Log Message:
-----------
Remove a couple of notice/warning error
make sure using <?php instead of <?
Modified Paths:
--------------
branches/team/Thomas/moodle/mod/voicetools/mod.html
branches/team/Thomas/moodle/mod/voicetools/view.php
Modified: branches/team/Thomas/moodle/mod/voicetools/mod.html
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-02-19 22:22:47 UTC (rev 248)
+++ branches/team/Thomas/moodle/mod/voicetools/mod.html 2008-02-19 22:27:56 UTC (rev 249)
@@ -768,7 +768,7 @@
?>
</select>
</td>
- <? }?>
+ <?php }?>
</td>
<td align=left >
<select id="start_hr" name="start_hr" <?php echo $disableAllElements ?>>
@@ -824,7 +824,7 @@
</tr>
<tr>
<td align="right">
- <font class="fontCurrent"><? echo get_string('description_calendar', 'voicetools')?></font>
+ <font class="fontCurrent"><?php echo get_string('description_calendar', 'voicetools')?></font>
</td>
<td align=left >
<textarea id="description" name="description" <?php echo $disableAllElements ?> rows="4" cols="30"><?php echo $description; ?></textarea>
@@ -843,7 +843,7 @@
<?php print_string('activity_manageTools', 'voicetools')?></a>
</td>
- <td align="right" class="action" onclick="self.location.href='<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php p($course_id)?>'">
+ <td align="right" class="action" onclick="self.location.href='<?php echo $CFG->wwwroot;?>/course/view.php?id=<?php p($course_id)?>'">
<label><?php print_string('validationElement_cancel', 'voicetools')?></label>
</td>
<?php
@@ -861,8 +861,7 @@
</tr>
</table>
</div>
-
-
+
<!-- These hidden variables are always the same -->
<input type="hidden" name="course" value="<?php p($form->course) ?>">
<input type="hidden" name="sesskey" value="<?php p($form->sesskey) ?>">
@@ -888,12 +887,12 @@
<?php include($CFG->wwwroot."/mod/voicetools/popup.php?type=error"); ?>
</div>
-<? if($error==true){ ?>
+<?php if($error==true){ ?>
<script>
docuament.getElementById("hiddenDiv").style.height=document.documentElement.clientHeight
document.getElementById("hiddenDiv").style.width=document.documentElement.clientWidth
document.getElementById("error").style.display="block";
document.getElementById("hiddenDiv").style.display="block";
</script>
-<? } ?>
+<?php } ?>
Modified: branches/team/Thomas/moodle/mod/voicetools/view.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/view.php 2008-02-19 22:22:47 UTC (rev 248)
+++ branches/team/Thomas/moodle/mod/voicetools/view.php 2008-02-19 22:27:56 UTC (rev 249)
@@ -143,18 +143,18 @@
}
function startVoiceBoard(){
- <? if(isset($roleSwitch) && $roleSwitch==true) { ?>
+ <?php if(isset($roleSwitch) && $roleSwitch==true) { ?>
result=window.confirm("<?php echo get_string ('launchstudent', 'voicetools');?>");
if(result==true) {
- doOpenPopup("<?php echo $servername ?>/<? echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
+ doOpenPopup("<?php echo $servername ?>/<?php echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
}
else
{
location.href= document.referrer;
}
- <? }else{ ?>
- doOpenPopup("<?php echo $servername ?>/<? echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
- <? } ?>
+ <?php }else{ ?>
+ doOpenPopup("<?php echo $servername ?>/<?php echo $resource->getType();?>?action=display_popup&nid=<?php echo $vtSession->getNid() ?>","<?php echo $resource->getType()?>");
+ <?php } ?>
}
</script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
