[Hw4mdl-svn] SF.net SVN: hw4mdl: [255] branches/team/Thomas/moodle/mod
Brought to you by:
jhlinder,
trollinger
Menu
▾
▴
[Hw4mdl-svn] SF.net SVN: hw4mdl: [255] branches/team/Thomas/moodle/mod
|
From: <tro...@us...> - 2008-03-13 19:43:50
|
Revision: 255
http://hw4mdl.svn.sourceforge.net/hw4mdl/?rev=255&view=rev
Author: trollinger
Date: 2008-03-13 12:43:48 -0700 (Thu, 13 Mar 2008)
Log Message:
-----------
update the header of the files
Modified Paths:
--------------
branches/team/Thomas/moodle/mod/liveclassroom/backuplib.php
branches/team/Thomas/moodle/mod/liveclassroom/config.html
branches/team/Thomas/moodle/mod/liveclassroom/doAction.php
branches/team/Thomas/moodle/mod/liveclassroom/generateSettings.php
branches/team/Thomas/moodle/mod/liveclassroom/index.php
branches/team/Thomas/moodle/mod/liveclassroom/lib.php
branches/team/Thomas/moodle/mod/liveclassroom/logs.php
branches/team/Thomas/moodle/mod/liveclassroom/mod.html
branches/team/Thomas/moodle/mod/liveclassroom/popup.php
branches/team/Thomas/moodle/mod/liveclassroom/reports.php
branches/team/Thomas/moodle/mod/liveclassroom/version.php
branches/team/Thomas/moodle/mod/liveclassroom/view.php
branches/team/Thomas/moodle/mod/liveclassroom/welcome.php
branches/team/Thomas/moodle/mod/voicetools/error.php
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/logs.php
branches/team/Thomas/moodle/mod/voicetools/manageAction.php
branches/team/Thomas/moodle/mod/voicetools/mod.html
branches/team/Thomas/moodle/mod/voicetools/popup.php
branches/team/Thomas/moodle/mod/voicetools/view.php
Modified: branches/team/Thomas/moodle/mod/liveclassroom/backuplib.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/backuplib.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/backuplib.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,103 +1,210 @@
-<?PHP
-/******************************************************************************
- * *
- * Copyright (c) 1999-2007 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: Hugues Pisapia *
- * *
- * Date: 15th April 2006 *
- * *
- ******************************************************************************/
+<?php //$Id: backuplib.php,v 1.5 2006/01/13 03:45:29 mjollnir_ Exp $
+ //This php script contains all the stuff to backup/restore
+ //liveclassroom mods
-/* $Id: backuplib.php 188 2007-04-13 13:23:01Z hugues $ */
+ //This is the "graphical" structure of the liveclassroom mod:
+ //
+ // liveclassroom
+ // (CL,pk->id)
+ // |
+ // |
+ // |
+ // liveclassroom_messages
+ // (UL,pk->id, fk->liveclassroomid)
+ //
+ // Meaning: pk->primary key field of the table
+ // fk->foreign key to link with parent
+ // nt->nested field (recursive data)
+ // CL->course level info
+ // UL->user level info
+ // files->table may have files)
+ //
+ //-----------------------------------------------------------
-/// Library of functions and constants for module liveclassroom
+ //This function executes all the backup procedure about this mod
+ function liveclassroom_backup_mods($bf,$preferences) {
-require_once($CFG->libdir.'/datalib.php');
-//require_once("$CFG->dirroot/mod/liveclassroom/api.php");
-require_once("$CFG->dirroot/mod/liveclassroom/lib.php");
+ global $CFG;
+ $status = true;
+ //Iterate over liveclassroom table
+ $liveclassrooms = get_records ("liveclassroom","course",$preferences->backup_course,"id");
+ if ($liveclassrooms) {
+ foreach ($liveclassrooms as $liveclassroom) {
+ if (backup_mod_selected($preferences,'liveclassroom',$liveclassroom->id)) {
+ $status = liveclassroom_backup_one_mod($bf,$preferences,$liveclassroom);
+ }
+ }
+ }
+ return $status;
+ }
-function liveclassroom_backup_mods($bf,$preferences) {
- global $CFG;
+ function liveclassroom_backup_one_mod($bf,$preferences,$liveclassroom) {
- $status = true;
+ global $CFG;
+
+ if (is_numeric($liveclassroom)) {
+ $liveclassroom = get_record('liveclassroom','id',$liveclassroom);
+ }
+
+ $status = true;
- //Iterate over liveclassroom table
- $liveclassrooms = get_records ("liveclassroom","course",$preferences->backup_course,"id");
- if ($liveclassrooms) {
- foreach ($liveclassrooms as $liveclassroom) {
- //Start mod
- fwrite ($bf,start_tag("MOD",3,true));
- //Print LC data
- fwrite ($bf,full_tag("ID",4,false,$liveclassroom->id));
- fwrite ($bf,full_tag("MODTYPE",4,false,"liveclassroom"));
- fwrite ($bf,full_tag("NAME",4,false,$liveclassroom->name));
-
- $status =fwrite ($bf,end_tag("MOD",3,true));
+ //Start mod
+ fwrite ($bf,start_tag("MOD",3,true));
+ //Print liveclassroom data
+ fwrite ($bf,full_tag("ID",4,false,$liveclassroom->id));
+ fwrite ($bf,full_tag("MODTYPE",4,false,"liveclassroom"));
+ fwrite ($bf,full_tag("NAME",4,false,$liveclassroom->name));
+ fwrite ($bf,full_tag("INTRO",4,false,$liveclassroom->intro));
+ fwrite ($bf,full_tag("KEEPDAYS",4,false,$liveclassroom->keepdays));
+ fwrite ($bf,full_tag("STUDENTLOGS",4,false,$liveclassroom->studentlogs));
+ fwrite ($bf,full_tag("SCHEDULE",4,false,$liveclassroom->schedule));
+ fwrite ($bf,full_tag("liveclassroomTIME",4,false,$liveclassroom->liveclassroomtime));
+ fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$liveclassroom->timemodified));
+ //if we've selected to backup users info, then execute backup_liveclassroom_messages
+ if (backup_userdata_selected($preferences,'liveclassroom',$liveclassroom->id)) {
+ $status = backup_liveclassroom_messages($bf,$preferences,$liveclassroom->id);
}
- }
+ //End mod
+ $status =fwrite ($bf,end_tag("MOD",3,true));
- //if we've selected to backup users info, then backup files too
- if ($status) {
- if ($preferences->mods["liveclassroom"]->userinfo) {
- //$status = liveclassroom_backup_files($bf,$preferences);
- }
+ return $status;
}
-
-
- return $status;
-}
+ //Backup liveclassroom_messages contents (executed from liveclassroom_backup_mods)
+ function backup_liveclassroom_messages ($bf,$preferences,$liveclassroom) {
+ global $CFG;
+ $status = true;
-////Return an array of info (name,value) reporting what will be backed up
-function liveclassroom_check_backup_mods($course,$user_data=false,$backup_unique_code) {
- //First the course data
- $info[0][0] = get_string("modulenameplural","liveclassroom");
- if ($ids = liveclassroom_ids ($course)) {
- $info[0][1] = count($ids);
- } else {
- $info[0][1] = 0;
+ $liveclassroom_messages = get_records("liveclassroom_messages","liveclassroomid",$liveclassroom,"id");
+ //If there is messages
+ if ($liveclassroom_messages) {
+ //Write start tag
+ $status =fwrite ($bf,start_tag("MESSAGES",4,true));
+ //Iterate over each message
+ foreach ($liveclassroom_messages as $cha_mes) {
+ //Start message
+ $status =fwrite ($bf,start_tag("MESSAGE",5,true));
+ //Print message contents
+ fwrite ($bf,full_tag("ID",6,false,$cha_mes->id));
+ fwrite ($bf,full_tag("USERID",6,false,$cha_mes->userid));
+ fwrite ($bf,full_tag("GROUPID",6,false,$cha_mes->groupid));
+ fwrite ($bf,full_tag("SYSTEM",6,false,$cha_mes->system));
+ fwrite ($bf,full_tag("MESSAGE_TEXT",6,false,$cha_mes->message));
+ fwrite ($bf,full_tag("TIMESTAMP",6,false,$cha_mes->timestamp));
+ //End submission
+ $status =fwrite ($bf,end_tag("MESSAGE",5,true));
+ }
+ //Write end tag
+ $status =fwrite ($bf,end_tag("MESSAGES",4,true));
+ }
+
+ return $status;
}
+ //Return an array of info (name,value)
+ function liveclassroom_check_backup_mods($course,$user_data=false,$backup_unique_code,$instances=null) {
- //Now, if requested, the user_data: look for the number of
- //rooms/archives available on the server and report
- if ($user_data) {
- $info[1][0] = get_string("rooms","liveclassroom");
- if ($ids = liveclassroom_count_rooms ($course)) {
- $info[1][1] = count($ids);
- } else {
- $info[1][1] = 0;
+ if (!empty($instances) && is_array($instances) && count($instances)) {
+ $info = array();
+ foreach ($instances as $id => $instance) {
+ $info += liveclassroom_check_backup_mods_instances($instance,$backup_unique_code);
+ }
+ return $info;
}
- $info[2][0] = get_string("archives","liveclassroom");
- if ($ids = liveclassroom_count_archives ($course)) {
- $info[2][1] = count($ids);
+ //First the course data
+ $info[0][0] = get_string("modulenameplural","liveclassroom");
+ if ($ids = liveclassroom_ids ($course)) {
+ $info[0][1] = count($ids)."dddd";
} else {
- $info[2][1] = 0;
+ $info[0][1] = 0;
}
+
+ //Now, if requested, the user_data
+ if ($user_data) {
+ $info[1][0] = get_string("messages","liveclassroom");
+ if ($ids = liveclassroom_message_ids_by_course ($course)) {
+ $info[1][1] = count($ids)."ssss";
+ } else {
+ $info[1][1] = 0;
+ }
+ }
+
+ return $info;
}
- return $info;
-}
+ //Return an array of info (name,value)
+ function liveclassroom_check_backup_mods_instances($instance,$backup_unique_code) {
+ //First the course data
+ $info[$instance->id.'0'][0] = '<b>'.$instance->name.'</b>';
+ $info[$instance->id.'0'][1] = '';
+
+ //Now, if requested, the user_data
+ if (!empty($instance->userdata)) {
+ $info[$instance->id.'1'][0] = get_string("messages","liveclassroom");
+ if ($ids = liveclassroom_message_ids_by_instance ($instance->id)) {
+ $info[$instance->id.'1'][1] = count($ids);
+ } else {
+ $info[$instance->id.'1'][1] = 0;
+ }
+ }
+
+ return $info;
+ }
+
+ //Return a content encoded to support interactivities linking. Every module
+ //should have its own. They are called automatically from the backup procedure.
+ function liveclassroom_encode_content_links ($content,$preferences) {
+
+ global $CFG;
+
+ $base = preg_quote($CFG->wwwroot,"/");
+
+ //Link to the list of liveclassrooms
+ $buscar="/(".$base."\/mod\/liveclassroom\/index.php\?id\=)([0-9]+)/";
+ $result= preg_replace($buscar,'$@liveclassroomINDEX*$2@$',$content);
+
+ //Link to liveclassroom view by moduleid
+ $buscar="/(".$base."\/mod\/liveclassroom\/view.php\?id\=)([0-9]+)/";
+ $result= preg_replace($buscar,'$@liveclassroomVIEWBYID*$2@$',$result);
+
+ return $result;
+ }
+
+ // INTERNAL FUNCTIONS. BASED IN THE MOD STRUCTURE
+
+ //Returns an array of liveclassrooms id
+ function liveclassroom_ids ($course) {
+
+ global $CFG;
+
+ return get_records_sql ("SELECT c.id, c.course
+ FROM {$CFG->prefix}liveclassroom c
+ WHERE c.course = '$course'");
+ }
+
+ //Returns an array of assignment_submissions id
+ function liveclassroom_message_ids_by_course ($course) {
+
+ global $CFG;
+
+ return get_records_sql ("SELECT m.id , m.liveclassroomid
+ FROM {$CFG->prefix}liveclassroom_messages m,
+ {$CFG->prefix}liveclassroom c
+ WHERE c.course = '$course' AND
+ m.liveclassroomid = c.id");
+ }
+
+ //Returns an array of liveclassroom id
+ function liveclassroom_message_ids_by_instance ($instanceid) {
+
+ global $CFG;
+
+ return get_records_sql ("SELECT m.id , m.liveclassroomid
+ FROM {$CFG->prefix}liveclassroom_messages m
+ WHERE m.liveclassroomid = $instanceid");
+ }
?>
Modified: branches/team/Thomas/moodle/mod/liveclassroom/config.html
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/config.html 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/config.html 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,4 +1,31 @@
<?php
+/******************************************************************************
+ * *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
+ * *
+ * COPYRIGHT: *
+ * This software is the property of 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 Wimba Moodle Integration; *
+ * if not, write to the Free Software Foundation, Inc., *
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
+ * *
+ * Author: Thomas Rollinger *
+ * *
+ * *
+ ******************************************************************************/
+
+
require_once("lib/php/lc/LCAction.php");
require_once("lib/php/lc/lcapi.php");
@@ -40,7 +67,7 @@
<table cellpadding="9" cellspacing="0" width="800px">
<tr>
<td width="2%">
- <img src="<?php echo $CFG->wwwroot;?>/mod/liveclassroom/pictures/items/liveclassroom.png" border="0" />
+ <img src="<?php echo $CFG->wwwroot;?>/mod/liveclassroom/lib/web/pictures/items/liveclassroom.png" border="0" />
</td>
<td align="left" class="page_title">
<?php print_string('serverconfiguration', 'liveclassroom')?>
Modified: branches/team/Thomas/moodle/mod/liveclassroom/doAction.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/doAction.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/doAction.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -2,10 +2,10 @@
/******************************************************************************
* *
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
* *
* COPYRIGHT: *
- * This software is the property of Horizon Wimba. *
+ * This software is the property of 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. *
@@ -17,15 +17,16 @@
* 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; *
+ * along with the Wimba Moodle Integration; *
* if not, write to the Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
* *
- * Author: Samy Hazan *
+ * Author: Hazan Samy *
* *
- * Date: September 2006 *
+ * Date: September 2006 *
* *
******************************************************************************/
+
/* $Id: doAction.php 55986 2007-11-13 21:51:00Z thomasr $ */
Modified: branches/team/Thomas/moodle/mod/liveclassroom/generateSettings.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/generateSettings.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/generateSettings.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,10 +1,10 @@
<?PHP
/******************************************************************************
* *
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
* *
* COPYRIGHT: *
- * This software is the property of Horizon Wimba. *
+ * This software is the property of 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. *
@@ -16,11 +16,11 @@
* 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; *
+ * along with the 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 *
+ * Author: Hazan Samy *
* *
* Date: October 2006 *
* *
@@ -94,7 +94,7 @@
if(!empty($error))
{
- $uiManager->setError("cla merde");
+ $uiManager->setError("erroe");
}
echo $uiManager->getXmlString();
Modified: branches/team/Thomas/moodle/mod/liveclassroom/index.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/index.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/index.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,10 +1,10 @@
<?PHP
/******************************************************************************
* *
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
* *
* COPYRIGHT: *
- * This software is the property of Horizon Wimba. *
+ * This software is the property of 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. *
@@ -16,7 +16,7 @@
* 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; *
+ * along with the Wimba Moodle Integration; *
* if not, write to the Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
* *
Modified: branches/team/Thomas/moodle/mod/liveclassroom/lib.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/lib.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/lib.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,30 +1,31 @@
<?php
-/**
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
- *
+/******************************************************************************
+ * *
+ * Copyright (c) 1999-2008 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. *
- *
+ * This software is the property of 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 *
- *
+ * 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 Wimba Moodle Integration; *
+ * if not, write to the Free Software Foundation, Inc., *
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
+ * *
* Author: Hugues Pisapia *
- *
+ * *
* Date: 15th April 2006 *
- */
-
+ * *
+ ******************************************************************************/
/* $Id: lib.php 200 2008-01-09 11:37:50Z trollinger $ */
// / Library of functions and constants for module liveclassroom
if (!function_exists('getKeysOfGeneralParameters')) {
@@ -112,6 +113,8 @@
*/
function liveclassroom_add_instance($liveclassroom)
{
+
+ global $CFG;
// / Given an object containing all the necessary data,
// / (defined by the form in mod.html) this function
// / will create a new instance and return the id number
@@ -123,30 +126,20 @@
// May have to add extra stuff in here #
$roomname = $api->lcapi_get_room_name($liveclassroom->type);
- if (!$result = insert_record("liveclassroom", $liveclassroom)) {
- wimba_add_log(WIMBA_ERROR,WV,"Problem to add a new instance");
- $result = false;
+ if (!$liveclassroom->id = insert_record("liveclassroom", $liveclassroom)) {
+ wimba_add_log(WIMBA_ERROR,WC,"Problem to add a new instance");
+ return false;
}
- if (!isset($liveclassroom->section))
- {
- $liveclassroom->section = 0;
- }
-
- if ($result != false && isset($liveclassroom->calendar_event) && $liveclassroom->calendar_event == true)
+ if (isset($liveclassroom->calendar_event) && $liveclassroom->calendar_event == true)
{ // no problem
- liveclassroom_addCalendarEvent($liveclassroom, $result, $roomname);
+ liveclassroom_addCalendarEvent($liveclassroom, $liveclassroom->id, $roomname);
}
- else
- {
- liveclassroom_deleteCalendarEvent($result);
- }
-
wimba_add_log(WIMBA_INFO,WC,"Add Instance".$result);
//for the debug
wimba_add_log(WIMBA_DEBUG,WC,print_r($liveclassroom, true ));
- return true;
+ return $liveclassroom->id;
}
function liveclassroom_update_instance($liveclassroom)
@@ -304,17 +297,17 @@
/**
* CALENDAR
*/
-function liveclassroom_addCalendarEvent($informations, $instanceNumber, $name)
+function liveclassroom_addCalendarEvent($activity_informations, $instanceNumber, $name)
{
// / Basic event record for the database.
global $CFG;
$event = new Object();
- $event->name = $informations->name;
- $event->description = $informations->description . "<br><a href=" . $CFG->wwwroot . "/mod/liveclassroom/view.php?id=" . $instanceNumber . "&action=launchCalendar target=_self >" . get_string("launch_calendar", "liveclassroom") . " ...</a>";
+ $event->name = $activity_informations->name;
+ $event->description = $activity_informations->description . "<br><a href=" . $CFG->wwwroot . "/mod/liveclassroom/view.php?id=" . $instanceNumber . "&action=launchCalendar target=_self >" . get_string("launch_calendar", "liveclassroom") . " ...</a>";
$event->format = 1;
$event->userid = 0;
- $event->courseid = $informations->course; //course event
+ $event->courseid = $activity_informations->course; //course event
$event->groupid = 0;
$event->modulename = 'liveclassroom';
$event->instance = $instanceNumber;
@@ -347,7 +340,8 @@
wimba_add_log(WIMBA_DEBUG,WC,"Add calendar event\n".print_r($event, true ));
- if(!$oldEvent=get_record('event','instance',$activity_informations->id)) //old event exsit
+ $oldEvent=get_record('event','instance',$activity_informations->id);
+ if(!empty($oldEvent) && $oldEvent!=false) //old event exsit exsit
{
$event->id = $oldEvent->id ;
$result=update_record('event', $event);
@@ -411,6 +405,7 @@
*/
function liveclassroom_delete_all_instance_of_room($roomid)
{
+ global $CFG;
// / Given an ID of an instance of this module,
// / this function will permanently delete the instance
// / and any data that depends on it.
Modified: branches/team/Thomas/moodle/mod/liveclassroom/logs.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/logs.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/logs.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,10 +1,10 @@
<?php
/******************************************************************************
* *
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
* *
* COPYRIGHT: *
- * This software is the property of Horizon Wimba. *
+ * This software is the property of 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. *
@@ -16,12 +16,13 @@
* 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; *
+ * along with the Wimba Moodle Integration; *
* if not, write to the Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
* *
* Author: Hugues Pisapia *
* *
+ * *
******************************************************************************/
//This page is to show the logs types and errors, and to explain how resolve the errors!
Modified: branches/team/Thomas/moodle/mod/liveclassroom/mod.html
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/mod.html 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/mod.html 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,10 +1,10 @@
<?php
/******************************************************************************
* *
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
* *
* COPYRIGHT: *
- * This software is the property of Horizon Wimba. *
+ * This software is the property of 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. *
@@ -16,7 +16,7 @@
* 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; *
+ * along with the Wimba Moodle Integration; *
* if not, write to the Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
* *
@@ -795,6 +795,7 @@
<input type="hidden" name=modulename value="<?php p($form->modulename) ?>" />
<input type="hidden" name=instance value="<?php p($form->instance) ?>" />
<input type="hidden" name=mode value="<?php p($form->mode) ?>" />
+ <input type="hidden" name="course_format" value="<?php p($course->format) ?>">
<input type="hidden" value="<?php echo $event->timestart;?>" name="calendar_start" id="calendar_start">
<input type="hidden" value="<?php echo $course->startdate;?>" name="calendar_start" id="calendar_start">
</form>
Modified: branches/team/Thomas/moodle/mod/liveclassroom/popup.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/popup.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/popup.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,5 +1,30 @@
<?php
-
+/******************************************************************************
+ * *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
+ * *
+ * COPYRIGHT: *
+ * This software is the property of 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 Wimba Moodle Integration; *
+ * if not, write to the Free Software Foundation, Inc., *
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
+ * *
+ * Author: Thomas Rollinger *
+ * *
+ * Date: February 2008 *
+ * *
+ ******************************************************************************/
require_once("../../config.php");
require_once("lib.php");
global $CFG;
Modified: branches/team/Thomas/moodle/mod/liveclassroom/reports.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/reports.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/reports.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,10 +1,10 @@
<?PHP
/******************************************************************************
* *
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
* *
* COPYRIGHT: *
- * This software is the property of Horizon Wimba. *
+ * This software is the property of 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. *
@@ -16,13 +16,13 @@
* 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; *
+ * along with the 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 *
+ * Author: Hazan Samy *
* *
- * Date: November 2006 *
+ * Date: November 2006 *
* *
******************************************************************************/
Modified: branches/team/Thomas/moodle/mod/liveclassroom/version.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/version.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/version.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,10 +1,10 @@
<?PHP
/******************************************************************************
* *
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
* *
* COPYRIGHT: *
- * This software is the property of Horizon Wimba. *
+ * This software is the property of 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. *
@@ -16,7 +16,7 @@
* 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; *
+ * along with the Wimba Moodle Integration; *
* if not, write to the Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
* *
Modified: branches/team/Thomas/moodle/mod/liveclassroom/view.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/view.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/view.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,10 +1,10 @@
<?php
/******************************************************************************
* *
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
* *
* COPYRIGHT: *
- * This software is the property of Horizon Wimba. *
+ * This software is the property of 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. *
@@ -16,7 +16,7 @@
* 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; *
+ * along with the Wimba Moodle Integration; *
* if not, write to the Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
* *
Modified: branches/team/Thomas/moodle/mod/liveclassroom/welcome.php
===================================================================
--- branches/team/Thomas/moodle/mod/liveclassroom/welcome.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/liveclassroom/welcome.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -2,10 +2,10 @@
/******************************************************************************
* *
- * Copyright (c) 1999-2007 Horizon Wimba, All Rights Reserved. *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
* *
* COPYRIGHT: *
- * This software is the property of Horizon Wimba. *
+ * This software is the property of 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. *
@@ -17,11 +17,11 @@
* 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; *
+ * along with the 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 *
+ * Author: Hazan Samy *
* *
* Date: September 2006 *
* *
@@ -150,7 +150,7 @@
<table width=100% style="height:300px">
<tbody>
<tr valign=middle>
- <td align=center><img src="lib/web/pictures/items/wheel.gif"><br>
+ <td align=center><img src="lib/web/pictures/items/Loading.gif"><br>
<p><font size="-2" face="Verdana" color="666666"> Loading...</font></p>
</td>
</tr>
Modified: branches/team/Thomas/moodle/mod/voicetools/error.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/error.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/voicetools/error.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,30 +1,30 @@
<?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: Thomas Rollinger *
-* *
-* Date: 3th March 2007 *
-* *
-******************************************************************************/
+ * *
+ * Copyright (c) 1999-2008 Wimba, All Rights Reserved. *
+ * *
+ * COPYRIGHT: *
+ * This software is the property of 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 Wimba Moodle Integration; *
+ * if not, write to the Free Software Foundation, Inc., *
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
+ * *
+ * Author: thomas Rollinger *
+ * *
+ * Date: March 2007 * *
+ * *
+ ******************************************************************************/
/* $Id: WimbaVoicetoolsAPI.php 45764 2007-02-28 22:04:25Z thomasr $ */
?>
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlChoicePage.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,31 +1,30 @@
<?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-2008 Wimba, All Rights Reserved. *
+ * *
+ * COPYRIGHT: *
+ * This software is the property of 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 Wimba Moodle Integration; *
+ * if not, write to the Free Software Foundation, Inc., *
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *
+ * *
+ * Author: Samy Hazan *
+ * *
+ * Date: October 2006 * *
+ * *
+ ******************************************************************************/
/* $Id: getXmlChoicePage.php 52853 2007-08-24 17:55:26Z thomasr $ */
global $CFG;
Modified: branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php
===================================================================
--- branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-03-12 21:16:29 UTC (rev 254)
+++ branches/team/Thomas/moodle/mod/voicetools/getXmlListPanel.php 2008-03-13 19:43:48 UTC (rev 255)
@@ -1,32 +1,33 @@
<?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-2008 Wimba, All Rights Reserved. *
+ * *
+ * COPYRIGHT: *
+ * This software is the property of 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. *
+ * ...
[truncated message content] |
