+This plugins shows page before showing the login page. +This is useful if you want a question before a user has the opportunity to login. +
+Example: +You're old enough to enter this site? If you accept the "option 1" then +you can enter to the campus (the login will appeared). + +If you select "option 2" then you're redirected to another page. \ No newline at end of file diff --git a/plugin/before_login/template.tpl b/plugin/before_login/template.tpl new file mode 100644 index 0000000000..77fa85e4ba --- /dev/null +++ b/plugin/before_login/template.tpl @@ -0,0 +1,14 @@ +{% if before_login.form_option1 %} +
+
+{% else %}
+
+{% endif %}
\ No newline at end of file
diff --git a/plugin/dashboard/block_course/block_course.class.php b/plugin/dashboard/block_course/block_course.class.php
index db412b4e46..1a45c4b8c4 100644
--- a/plugin/dashboard/block_course/block_course.class.php
+++ b/plugin/dashboard/block_course/block_course.class.php
@@ -9,189 +9,200 @@
/**
* required files for getting data
*/
+require_once api_get_path(LIBRARY_PATH) . 'thematic.lib.php';
/**
* This class is used like controller for this course block plugin,
* the class name must be registered inside path.info file (e.g: controller = "BlockCourse"), so dashboard controller will be instantiate it
* @package chamilo.dashboard
*/
-class BlockCourse extends Block {
-
- private $user_id;
- private $courses;
- private $path;
- private $permission = array(DRH);
-
- /**
- * Constructor
- */
- public function __construct ($user_id) {
- $this->user_id = $user_id;
- $this->path = 'block_course';
- if ($this->is_block_visible_for_user($user_id)) {
- /*if (api_is_platform_admin()) {
- $this->courses = CourseManager::get_real_course_list();
- } else {*/
- $this->courses = CourseManager::get_courses_followed_by_drh($user_id);
- //}
- }
- }
+class BlockCourse extends Block
+{
+
+ private $user_id;
+ private $courses;
+ private $path;
+ private $permission = array(DRH);
- /**
- * This method check if a user is allowed to see the block inside dashboard interface
- * @param int User id
- * @return bool Is block visible for user
- */
- public function is_block_visible_for_user($user_id) {
- $user_info = api_get_user_info($user_id);
- $user_status = $user_info['status'];
- $is_block_visible_for_user = false;
- if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
- $is_block_visible_for_user = true;
- }
- return $is_block_visible_for_user;
+ /**
+ * Constructor
+ */
+ public function __construct($user_id)
+ {
+ $this->user_id = $user_id;
+ $this->path = 'block_course';
+ if ($this->is_block_visible_for_user($user_id)) {
+ $this->courses = CourseManager::get_courses_followed_by_drh($user_id);
+ }
}
+ /**
+ * This method check if a user is allowed to see the block inside dashboard interface
+ * @param int User id
+ * @return bool Is block visible for user
+ */
+ public function is_block_visible_for_user($user_id)
+ {
+ $user_info = api_get_user_info($user_id);
+ $user_status = $user_info['status'];
+ $is_block_visible_for_user = false;
+ if (UserManager::is_admin($user_id) || in_array(
+ $user_status,
+ $this->permission
+ )
+ ) {
+ $is_block_visible_for_user = true;
+ }
+ return $is_block_visible_for_user;
+ }
/**
* This method return content html containing information about courses and its position for showing it inside dashboard interface
* it's important to use the name 'get_block' for beeing used from dashboard controller
* @return array column and content html
*/
- public function get_block() {
-
- global $charset;
-
- $column = 2;
- $data = array();
- $content = '';
- $data_table = '';
- $content = $this->get_content_html();
- $html = '
+ public function get_block()
+ {
+ global $charset;
+ $column = 2;
+ $data = array();
+ $content = $this->get_content_html();
+ $html = '
+
+
+ {{ before_login.form_option1 }}
+
+
+ {{ before_login.form_option2 }}
+
+ ';
- $content .= '
+ global $charset;
+ $column = 2;
+ $data = array();
+ $content = $this->get_content_html();
+ $html = '
';
- $data['column'] = $column;
- $data['content_html'] = $html;
+ $data['column'] = $column;
+ $data['content_html'] = $html;
- return $data;
+ return $data;
}
- /**
- * This method return a content html, it's used inside get_block method for showing it inside dashboard interface
- * @return string content html
- */
- public function get_content_html() {
-
- $course_data = $this->get_course_information_data();
- $content = '
'.get_lang('YourCourseList').'
'; + /** + * This method return a content html, it's used inside get_block method for showing it inside dashboard interface + * @return string content html + */ + public function get_content_html() + { + $course_data = $this->get_course_information_data(); + $content = '';
+ $content .= '';
- $data_table .= '';
+ if (!isset($course[2])) {
+ $course[2] = '0:00:00';
+ }
+ foreach ($course as $cell) {
+ $data_table .= '' . $cell . ' ';
+ }
+ $data_table .= ' ';
+ $i++;
+ }
+ $data_table .= '
';
+ } else {
+ $data_table .= get_lang('ThereIsNoInformationAboutYourCourses');
+ }
+ $content .= $data_table;
+ if (!empty($course_data)) {
+ $content .= '';
+ }
+ $content .= '
';
+
+ return $content;
+ }
/**
- * Get number of courses
- * @return int
- */
- function get_number_of_courses() {
- return count($this->courses);
- }
-
- /**
- * Get course information data
- * @return array
- */
- function get_course_information_data()
+ * Get number of courses
+ * @return int
+ */
+ function get_number_of_courses()
{
- $tbl_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
- $course_data = array();
- $courses = $this->courses;
-
- foreach ($courses as $row_course) {
- $thematic = new Thematic($row_course);
- $course_code = $row_course['code'];
- $courseId = $row_course['real_id'];
-
- $nb_students_in_course = $avg_progress_in_course = $avg_score_in_course = $avg_time_spent_in_course = $avg_score_in_exercise = 0;
-
- // students directly subscribed to the course
- $sql = "SELECT user_id FROM $tbl_course_user as course_rel_user
- WHERE course_rel_user.status=".STUDENT." AND course_rel_user.c_id = $courseId";
- $rs = Database::query($sql);
- $users = array();
- while ($row = Database::fetch_array($rs)) {
- $users[] = $row['user_id'];
- }
- if (count($users) > 0) {
- $nb_students_in_course = count($users);
- $avg_time_spent_in_course = api_time_to_hms(Tracking::get_time_spent_on_the_course($users, $courseId)/$nb_students_in_course);
- } else {
- $avg_time_spent_in_course = null;
- }
-
- $tematic_advance_progress = 0;
-
- $tematic_advance = $thematic->get_total_average_of_thematic_advances($course_code, 0);
-
- if (!empty($tematic_advance)) {
- $tematic_advance_progress = ''.$tematic_advance.'%';
- } else {
- $tematic_advance_progress = '0%';
- }
-
- $table_row = array();
- $table_row[] = $row_course['title'];
- $table_row[] = $nb_students_in_course;
- $table_row[] = $avg_time_spent_in_course;
- $table_row[] = $tematic_advance_progress;
- $course_data[] = $table_row;
- }
-
- return $course_data;
- }
+ return count($this->courses);
+ }
+ /**
+ * Get course information data
+ * @return array
+ */
+ function get_course_information_data()
+ {
+ $tbl_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+ $course_data = array();
+ $courses = $this->courses;
+
+ $thematic = new Thematic();
+
+ foreach ($courses as $row_course) {
+
+ $course_code = $row_course['code'];
+ $nb_students_in_course = $avg_progress_in_course = $avg_score_in_course = $avg_time_spent_in_course = $avg_score_in_exercise = 0;
+
+ // students directly subscribed to the course
+ $sql = "SELECT user_id FROM $tbl_course_user as course_rel_user
+ WHERE course_rel_user.status=" . STUDENT . " AND course_rel_user.course_code='$course_code'";
+ $rs = Database::query($sql);
+ $users = array();
+ while ($row = Database::fetch_array($rs)) {
+ $users[] = $row['user_id'];
+ }
+ if (count($users) > 0) {
+ $nb_students_in_course = count($users);
+ $avg_time_spent_in_course = api_time_to_hms(
+ Tracking::get_time_spent_on_the_course($users, $course_code ) / $nb_students_in_course);
+ } else {
+ $avg_time_spent_in_course = null;
+ }
+ $tematic_advance = $thematic->get_total_average_of_thematic_advances(
+ $course_code,
+ 0
+ );
+
+ if (!empty($tematic_advance)) {
+ $tematic_advance_progress = '' . $tematic_advance . '%';
+ } else {
+ $tematic_advance_progress = '0%';
+ }
+
+ $table_row = array();
+ $table_row[] = $row_course['title'];
+ $table_row[] = $nb_students_in_course;
+ $table_row[] = $avg_time_spent_in_course;
+ $table_row[] = $tematic_advance_progress;
+ $course_data[] = $table_row;
+ }
+
+ return $course_data;
+ }
}
-?>
diff --git a/plugin/dashboard/block_daily/block_daily.class.php b/plugin/dashboard/block_daily/block_daily.class.php
index e3631b3cb8..895e754a73 100644
--- a/plugin/dashboard/block_daily/block_daily.class.php
+++ b/plugin/dashboard/block_daily/block_daily.class.php
@@ -5,156 +5,170 @@
* @package chamilo.dashboard
* @author Marco Sousa original code
* @author Julio Montoya class named was changed of name, and some minor changes
-
*/
/**
* required files for getting data
*/
-require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be.inc.php';
+require_once api_get_path(LIBRARY_PATH) . 'thematic.lib.php';
+require_once api_get_path(LIBRARY_PATH) . 'attendance.lib.php';
+require_once api_get_path(SYS_CODE_PATH) . 'gradebook/lib/be.inc.php';
/**
* This class is used like controller for this course block plugin,
* the class name must be registered inside path.info file (e.g: controller = "BlockDiario"), so dashboard controller will be instantiate it
* @package chamilo.dashboard
*/
-class BlockDaily extends Block {
-
- private $user_id;
- private $courses;
- private $path;
- private $permission = array(DRH);
-
- /**
- * Constructor
- */
- public function __construct ($user_id) {
- $this->user_id = $user_id;
- $this->path = 'block_daily';
- if ($this->is_block_visible_for_user($user_id)) {
- /*if (api_is_platform_admin()) {
- $this->courses = CourseManager::get_real_course_list();
- } else {*/
- $this->courses = CourseManager::get_courses_followed_by_drh($user_id);
- //}
- }
- }
+class BlockDaily extends Block
+{
+
+ private $user_id;
+ private $courses;
+ private $path;
+ private $permission = array(DRH);
- /**
- * This method check if a user is allowed to see the block inside dashboard interface
- * @param int User id
- * @return bool Is block visible for user
- */
- public function is_block_visible_for_user($user_id) {
- $user_info = api_get_user_info($user_id);
- $user_status = $user_info['status'];
- $is_block_visible_for_user = false;
- if (UserManager::is_admin($user_id) || in_array($user_status, $this->permission)) {
- $is_block_visible_for_user = true;
- }
- return $is_block_visible_for_user;
+ /**
+ * Constructor
+ */
+ public function __construct($user_id)
+ {
+ $this->user_id = $user_id;
+ $this->path = 'block_daily';
+ if ($this->is_block_visible_for_user($user_id)) {
+ $this->courses = CourseManager::get_courses_followed_by_drh(
+ $user_id
+ );
+ }
}
+ /**
+ * This method check if a user is allowed to see the block inside dashboard interface
+ * @param int User id
+ * @return bool Is block visible for user
+ */
+ public function is_block_visible_for_user($user_id)
+ {
+ $user_info = api_get_user_info($user_id);
+ $user_status = $user_info['status'];
+ $is_block_visible_for_user = false;
+ if (UserManager::is_admin($user_id) || in_array(
+ $user_status,
+ $this->permission
+ )
+ ) {
+ $is_block_visible_for_user = true;
+ }
+ return $is_block_visible_for_user;
+ }
/**
* This method return content html containing information about courses and its position for showing it inside dashboard interface
* it's important to use the name 'get_block' for beeing used from dashboard controller
* @return array column and content html
*/
- public function get_block() {
-
- global $charset;
+ public function get_block()
+ {
- $column = 2;
- $data = array();
- $content = '';
- $data_table = '';
- $content = $this->get_content_html();
- $html = '' . get_lang( + 'YourCourseList' + ) . '
'; $data_table = null; - if (!empty($course_data)) { - $data_table .= '| '.get_lang('CourseTitle').' | -'.get_lang('NbStudents').' | -'.get_lang('AvgTimeSpentInTheCourse').' | -'.get_lang('ThematicAdvance').' | + if (!empty($course_data)) { + $data_table .= '
|---|
| ' . get_lang('CourseTitle') . ' | +' . get_lang('NbStudents') . ' | +' . get_lang('AvgTimeSpentInTheCourse') . ' | +' . get_lang('ThematicAdvance') . ' |
|---|---|---|---|
| '.$cell.' | '; - } - $data_table .= '
';
- $content .= '
-
-
- ';
+
+
+ ';
$data['column'] = $column;
$data['content_html'] = $html;
@@ -124,10 +120,13 @@ class BlockEvaluationGraph extends Block {
}
/**
- * This method return a graph containing informations about evaluations inside base courses, it's used inside get_block method for showing it inside dashboard interface
+ * This method return a graph containing informations about evaluations
+ * inside base courses, it's used inside get_block method for showing
+ * it inside dashboard interface
* @return string img html
*/
- public function get_evaluations_base_courses_graph() {
+ public function get_evaluations_base_courses_graph()
+ {
$graphs = array();
if (!empty($this->courses)) {
$courses_code = array_keys($this->courses);
@@ -160,7 +159,7 @@ class BlockEvaluationGraph extends Block {
$data_set->RemoveSerie("Items");
$data_set->SetAbsciseLabelSerie("Items");
$graph_id = $this->user_id.'StudentEvaluationGraph';
- $cache = new pCache(api_get_path(SYS_ARCHIVE_PATH));
+ $cache = new pCache();
// the graph id
$data = $data_set->GetData();
if ($cache->IsInCache($graph_id, $data)) {
@@ -211,19 +210,20 @@ class BlockEvaluationGraph extends Block {
}
/**
- * This method return a graph containing informations about evaluations inside courses in sessions, it's used inside get_block method for showing it inside dashboard interface
+ * This method return a graph containing information about evaluations
+ * inside courses in sessions, it's used inside get_block method for
+ * showing it inside dashboard interface
* @return string img html
*/
- public function get_evaluations_courses_in_sessions_graph() {
+ public function get_evaluations_courses_in_sessions_graph()
+ {
$graphs = array();
if (!empty($this->sessions)) {
$session_ids = array_keys($this->sessions);
foreach ($session_ids as $session_id) {
$courses_code = array_keys(Tracking::get_courses_list_from_session($session_id));
$courses_graph = array();
- foreach ($courses_code as $courseId) {
- $courseInfo = api_get_course_info_by_id($courseId);
- $course_code = $courseInfo['code'];
+ foreach ($courses_code as $course_code) {
$cats = Category::load(null, null, $course_code, null, null, $session_id);
if (isset($cats) && isset($cats[0])) {
$alleval = $cats[0]->get_evaluations(null, true, $course_code);
@@ -251,7 +251,7 @@ class BlockEvaluationGraph extends Block {
$data_set->RemoveSerie("Items");
$data_set->SetAbsciseLabelSerie("Items");
$graph_id = $this->user_id.'StudentEvaluationGraph';
- $cache = new pCache(api_get_path(SYS_ARCHIVE_PATH));
+ $cache = new pCache();
// the graph id
$data = $data_set->GetData();
if ($cache->IsInCache($graph_id, $data)) {
@@ -303,4 +303,4 @@ class BlockEvaluationGraph extends Block {
}
return $graphs;
}
-}
\ No newline at end of file
+}
diff --git a/plugin/dashboard/block_global_info/block_global_info.class.php b/plugin/dashboard/block_global_info/block_global_info.class.php
index 67448f0e50..240b73355c 100644
--- a/plugin/dashboard/block_global_info/block_global_info.class.php
+++ b/plugin/dashboard/block_global_info/block_global_info.class.php
@@ -10,6 +10,8 @@
/**
* required files for getting data
*/
+require_once api_get_path(SYS_CODE_PATH).'admin/statistics/statistics.lib.php';
+
/**
* This class is used like controller for this global info block plugin
* the class name must be registered inside path.info file
@@ -59,15 +61,12 @@ class BlockGlobalInfo extends Block
* it's important to use the name 'get_block' for beeing used from dashboard controller
* @return array column and content html
*/
- public function get_block() {
-
+ public function get_block()
+ {
global $charset;
-
$column = 2;
$data = array();
- $content = '';
- $data_table = '';
- $content = $this->get_content_html();
+ $content = $this->get_content_html();
$html = '
'.get_lang('YourCourseList').'
'; + /** + * This method return a content html, it's used inside get_block method for showing it inside dashboard interface + * @return string content html + */ + public function get_content_html() + { + $course_data = $this->get_course_information_data(); + $content = '';
+ $content .= '';
- $data_table .= '';
+ if (!isset($course[3])) {
+ $course[3] = get_lang('NotAvailable');
+ }
+ foreach ($course as $cell) {
+ $data_table .= '' . $cell . ' ';
+ }
+ $data_table .= ' ';
+ $i++;
+ }
+ $data_table .= '
';
+ } else {
+ $data_table .= get_lang('ThereIsNoInformationAboutYourCourses');
+ }
+ $content .= $data_table;
+ if (!empty($course_data)) {
+ $content .= '';
+ }
+ $content .= '
';
+ return $content;
+ }
/**
- * Get number of courses
- * @return int
- */
- function get_number_of_courses() {
- return count($this->courses);
- }
-
- /**
- * Get course information data
- * @return array
- */
- function get_course_information_data() {
- $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
- $tbl_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-
- $a_course_students = array();
- $course_data = array();
- $courses = $this->courses;
-
- foreach ($courses as $row_course) {
+ * Get number of courses
+ * @return int
+ */
+ function get_number_of_courses()
+ {
+ return count($this->courses);
+ }
+
+ /**
+ * Get course information data
+ * @return array
+ */
+ function get_course_information_data()
+ {
+ $tbl_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+ $course_data = array();
+ $courses = $this->courses;
+
+ foreach ($courses as $row_course) {
$score = null;
$course_code = $row_course['code'];
$course_info = api_get_course_info($course_code);
@@ -165,62 +179,73 @@ class BlockDaily extends Block {
// Attendance table
$table_course = Database::get_course_table(TABLE_ATTENDANCE);
- $sql = "SELECT id, name, attendance_qualify_max FROM $table_course WHERE c_id = ".$course_info['real_id']." AND active = 1 AND session_id = 0";
- $rs = Database::query($sql);
- $attendance = array();
+ $sql = "SELECT id, name, attendance_qualify_max FROM $table_course
+ WHERE c_id = " . $course_info['real_id'] . " AND active = 1 AND session_id = 0";
+ $rs = Database::query($sql);
+ $attendance = array();
$attendances = array();
$param_gradebook = '';
if (isset($_SESSION['gradebook'])) {
- $param_gradebook = '&gradebook='.$_SESSION['gradebook'];
+ $param_gradebook = '&gradebook=' . $_SESSION['gradebook'];
}
- while ($row = Database::fetch_array($rs,'ASSOC')) {
+ while ($row = Database::fetch_array($rs, 'ASSOC')) {
$attendance['done'] = $row['attendance_qualify_max'];
$attendance['id'] = $row['id'];
//$attendance['name'] = $row['name'];
$attendance['course_code'] = $course_code;
- if ($attendance['done'] != '0')
- $attendances[] = ''.Display::return_icon('printmgr.gif',get_lang('Print')).'';
- else
+ if ($attendance['done'] != '0') {
+ $attendances[] = '' . Display::return_icon('printmgr.gif', get_lang('Print')).'';
+ } else {
$attendances[] = get_lang("NotAvailable");
- }
-
- $sql = "SELECT user_id FROM $tbl_course_user as course_rel_user
- WHERE course_rel_user.status=".STUDENT." AND course_rel_user.c_id = ".$course_info['real_id'];
- $rs = Database::query($sql);
- $users = array();
- while ($row = Database::fetch_array($rs)) {
- $users[] = $row['user_id'];
- }
- if (count($users) > 0) {
- $nb_students_in_course = count($users);
- }
-
- if (!empty($tematic_advance)) {
- $tematic_advance_progress = ''.$tematic_advance.'%';
- } else {
- $tematic_advance_progress = '0%';
- }
+ }
+ }
+
+ // quantidade de alunos
+
+ $sql = "SELECT user_id FROM $tbl_course_user as course_rel_user
+ WHERE course_rel_user.status=" . STUDENT . " AND course_rel_user.course_code='$course_code'";
+ $rs = Database::query($sql);
+ $users = array();
+ while ($row = Database::fetch_array($rs)) {
+ $users[] = $row['user_id'];
+ }
+ if (count($users) > 0) {
+ $nb_students_in_course = count($users);
+ }
+
+ if (!empty($tematic_advance)) {
+ $tematic_advance_progress = '' . $tematic_advance . '%';
+ } else {
+ $tematic_advance_progress = '0%';
+ }
// Score
- $tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
- $sql = "SELECT id from " . $tbl_grade_categories ." WHERE course_code ='".$course_code."'";
- $rs = Database::query($sql);
- $category = null;
- while ($row = Database::fetch_array($rs)) {
- $category = $row['id'];
- }
-
- if (!empty($category)) {
+ $tbl_grade_categories = Database :: get_main_table(
+ TABLE_MAIN_GRADEBOOK_CATEGORY
+ );
+ $sql = "SELECT id from " . $tbl_grade_categories . "
+ WHERE course_code ='" . $course_code . "'";
+ $rs = Database::query($sql);
+ $category = null;
+ while ($row = Database::fetch_array($rs)) {
+ $category = $row['id'];
+ }
+
+ if (!empty($category)) {
$cat = Category::load($category);
$eval = $cat[0]->get_evaluations();
- if (count($eval) > 0){
+ if (count($eval) > 0) {
$i = 0;
foreach ($eval as $item) {
- $score .= ''.$item->get_name().'';
- if (count($eval)-1 != $i) {
+ $score .= '' . $item->get_name() . '';
+ if (count($eval) - 1 != $i) {
$score .= ', ';
}
$i++;
@@ -228,17 +253,17 @@ class BlockDaily extends Block {
} else {
$score = get_lang("NotAvailable");
}
- } else {
+ } else {
$score = get_lang("NotAvailable");
}
- $table_row = array();
- $table_row[] = $row_course['title'];
- $table_row[] = $nb_students_in_course;
- $table_row[] = $score;
- $table_row[] = $attendances[0];
- $course_data[] = $table_row;
- }
- return $course_data;
- }
-}
\ No newline at end of file
+ $table_row = array();
+ $table_row[] = $row_course['title'];
+ $table_row[] = $nb_students_in_course;
+ $table_row[] = $score;
+ $table_row[] = $attendances[0];
+ $course_data[] = $table_row;
+ }
+ return $course_data;
+ }
+}
diff --git a/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php b/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
index d0fc17cd97..c9c23edf95 100644
--- a/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
+++ b/plugin/dashboard/block_evaluation_graph/block_evaluation_graph.class.php
@@ -11,6 +11,9 @@
/**
* required files for getting data
*/
+require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php';
+require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php';
+require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/gradebookitem.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/evaluation.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/result.class.php';
@@ -24,8 +27,8 @@ require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/category.class.php';
* the class name must be registered inside path.info file (e.g: controller = "BlockEvaluationGraph"), so dashboard controller will be instantiate it
* @package chamilo.dashboard
*/
-class BlockEvaluationGraph extends Block {
-
+class BlockEvaluationGraph extends Block
+{
private $user_id;
private $courses;
private $sessions;
@@ -35,25 +38,18 @@ class BlockEvaluationGraph extends Block {
/**
* Constructor
*/
- public function __construct ($user_id) {
+ public function __construct($user_id)
+ {
$this->path = 'block_evaluation_graph';
$this->user_id = $user_id;
$this->bg_width = 450;
$this->bg_height = 350;
if ($this->is_block_visible_for_user($user_id)) {
- //$this->courses = CourseManager::get_real_course_list();
- /*if (api_is_platform_admin()) {
- $this->courses = CourseManager::get_real_course_list();
- $this->sessions = SessionManager::get_sessions_list();
- } else {*/
- if (!api_is_session_admin()) {
- $this->courses = CourseManager::get_courses_followed_by_drh($user_id);
- }
- $this->sessions = SessionManager::get_sessions_followed_by_drh($user_id);
- //}
+ if (!api_is_session_admin()) {
+ $this->courses = CourseManager::get_courses_followed_by_drh($user_id);
+ }
+ $this->sessions = SessionManager::get_sessions_followed_by_drh($user_id);
}
-
-
}
/**
@@ -61,7 +57,8 @@ class BlockEvaluationGraph extends Block {
* @param int User id
* @return bool Is block visible for user
*/
- public function is_block_visible_for_user($user_id) {
+ public function is_block_visible_for_user($user_id)
+ {
$user_info = api_get_user_info($user_id);
$user_status = $user_info['status'];
$is_block_visible_for_user = false;
@@ -76,47 +73,46 @@ class BlockEvaluationGraph extends Block {
* it's important to use the name 'get_block' for beeing used from dashboard controller
* @return array column and content html
*/
- public function get_block() {
+ public function get_block()
+ {
global $charset;
-
$column = 1;
$data = array();
$evaluations_base_courses_graph = $this->get_evaluations_base_courses_graph();
-
$evaluations_courses_in_sessions_graph = $this->get_evaluations_courses_in_sessions_graph();
$html = '' . get_lang( + 'YourCourseList' + ) . '
'; $data_table = null; - if (!empty($course_data)) { - $data_table .= '| '.get_lang('CourseTitle').' | -'.get_lang('NbStudents').' | -'.get_lang('Evaluation').' | -'.get_lang('ToolAttendance').' | + if (!empty($course_data)) { + $data_table .= '
|---|
| ' . get_lang('CourseTitle') . ' | +' . get_lang('NbStudents') . ' | +' . get_lang('Evaluation') . ' | +' . get_lang('ToolAttendance') . ' |
|---|---|---|---|
| '.$cell.' | '; - } - $data_table .= '
@@ -89,8 +88,8 @@ class BlockGlobalInfo extends Block
* This method return a content html, it's used inside get_block method for showing it inside dashboard interface
* @return string content html
*/
- public function get_content_html() {
-
+ public function get_content_html()
+ {
$global_data = $this->get_global_information_data();
$content = '
';
$content .= '
'.$title.'
- '.$date_string.'
+ '.$date.'
'.$count_courses_in_session.'
';
$i++;
@@ -141,8 +149,9 @@ class BlockSession extends Block {
* Get number of sessions
* @return int
*/
- function get_number_of_sessions() {
+ function get_number_of_sessions()
+ {
return count($this->sessions);
}
-}
\ No newline at end of file
+}
diff --git a/plugin/dashboard/block_student/block_student.class.php b/plugin/dashboard/block_student/block_student.class.php
index 290b9546bf..fcbe118c10 100644
--- a/plugin/dashboard/block_student/block_student.class.php
+++ b/plugin/dashboard/block_student/block_student.class.php
@@ -9,6 +9,7 @@
/**
* required files for getting data
*/
+require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/gradebookitem.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/evaluation.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/result.class.php';
@@ -20,7 +21,8 @@ require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/category.class.php';
* the class name must be registered inside path.info file (e.g: controller = "BlockStudent"), so dashboard controller will be instantiate it
* @package chamilo.dashboard
*/
-class BlockStudent extends Block {
+class BlockStudent extends Block
+{
private $user_id;
private $students;
@@ -30,16 +32,12 @@ class BlockStudent extends Block {
/**
* Constructor
*/
- public function __construct ($user_id) {
+ public function __construct ($user_id)
+ {
$this->user_id = $user_id;
$this->path = 'block_student';
if ($this->is_block_visible_for_user($user_id)) {
- /*if (api_is_platform_admin()) {
- $this->students = UserManager::get_user_list(array('status' => STUDENT));
- } else {*/
-
$this->students = UserManager::get_users_followed_by_drh($user_id, STUDENT);
- //}
}
}
@@ -48,7 +46,8 @@ class BlockStudent extends Block {
* @param int User id
* @return bool Is block visible for user
*/
- public function is_block_visible_for_user($user_id) {
+ public function is_block_visible_for_user($user_id)
+ {
$user_info = api_get_user_info($user_id);
$user_status = $user_info['status'];
$is_block_visible_for_user = false;
@@ -63,7 +62,8 @@ class BlockStudent extends Block {
* it's important to use the name 'get_block' for beeing used from dashboard controller
* @return array column and content html
*/
- public function get_block() {
+ public function get_block()
+ {
global $charset;
$column = 1;
$data = array();
@@ -89,7 +89,8 @@ class BlockStudent extends Block {
* This method return a content html, it's used inside get_block method for showing it inside dashboard interface
* @return string content html
*/
- public function get_students_content_html_for_platform_admin() {
+ public function get_students_content_html_for_platform_admin()
+ {
$students = $this->students;
$content = '
'.get_lang('GlobalPlatformInformation').'
'; @@ -139,7 +138,7 @@ class BlockGlobalInfo extends Block array(get_lang('NumberOfCoursesPublic'), ''.Statistics::count_courses_by_visibility(COURSE_VISIBILITY_OPEN_WORLD).''), array(get_lang('NumberOfCoursesOpen'), ''.Statistics::count_courses_by_visibility(COURSE_VISIBILITY_OPEN_PLATFORM).''), array(get_lang('NumberOfCoursesPrivate'), ''.Statistics::count_courses_by_visibility(COURSE_VISIBILITY_REGISTERED).''), - array(get_lang('NumberOfCoursesClosed'), ''.Statistics::count_courses_by_visibility(COURSE_VISIBILITY_CLOSED).'') + array(get_lang('NumberOfCoursesClosed'), ''.Statistics::count_courses_by_visibility(COURSE_VISIBILITY_CLOSED).''), array(get_lang('NumberOfCoursesHidden'), ''.Statistics::count_courses_by_visibility(COURSE_VISIBILITY_HIDDEN).'') ); return $global_info; diff --git a/plugin/dashboard/block_session/block_session.class.php b/plugin/dashboard/block_session/block_session.class.php index a582fb6486..fc12b55f64 100644 --- a/plugin/dashboard/block_session/block_session.class.php +++ b/plugin/dashboard/block_session/block_session.class.php @@ -9,13 +9,16 @@ /** * required files for getting data */ +require_once api_get_path(LIBRARY_PATH).'course_description.lib.php'; /** * This class is used like controller for this session block plugin, - * the class name must be registered inside path.info file (e.g: controller = "BlockSession"), so dashboard controller will be instantiate it + * the class name must be registered inside path.info file + * (e.g: controller = "BlockSession"), so dashboard controller will be instantiate it * @package chamilo.dashboard */ -class BlockSession extends Block { +class BlockSession extends Block +{ private $user_id; private $sessions; @@ -25,15 +28,12 @@ class BlockSession extends Block { /** * Constructor */ - public function __construct ($user_id) { + public function __construct ($user_id) + { $this->user_id = $user_id; $this->path = 'block_session'; if ($this->is_block_visible_for_user($user_id)) { - /*if (api_is_platform_admin()) { - $this->sessions = SessionManager::get_sessions_list(); - } else {*/ - $this->sessions = SessionManager::get_sessions_followed_by_drh($user_id); - //} + $this->sessions = SessionManager::get_sessions_followed_by_drh($user_id); } } @@ -42,7 +42,8 @@ class BlockSession extends Block { * @param int User id * @return bool Is block visible for user */ - public function is_block_visible_for_user($user_id) { + public function is_block_visible_for_user($user_id) + { $user_info = api_get_user_info($user_id); $user_status = $user_info['status']; $is_block_visible_for_user = false; @@ -57,7 +58,8 @@ class BlockSession extends Block { * it's important to use the name 'get_block' for beeing used from dashboard controller * @return array column and content html */ - public function get_block() { + public function get_block() + { global $charset; @@ -88,7 +90,8 @@ class BlockSession extends Block { * This method return a content html, it's used inside get_block method for showing it inside dashboard interface * @return string content html */ - public function get_content_html() { + public function get_content_html() + { $content = ''; $sessions = $this->sessions; @@ -108,7 +111,12 @@ class BlockSession extends Block { $session_id = intval($session['id']); $title = $session['name']; - $date_string = SessionManager::parse_session_dates($session); + + if ($session['date_start'] != '0000-00-00' && $session['date_end'] != '0000-00-00') { + $date = get_lang('From').' '.api_convert_and_format_date($session['date_start'], DATE_FORMAT_SHORT, date_default_timezone_get()).' '.get_lang('To').' '.api_convert_and_format_date($session['date_end'], DATE_FORMAT_SHORT, date_default_timezone_get()); + } else { + $date = ' - '; + } $count_courses_in_session = count(Tracking::get_courses_list_from_session($session_id)); @@ -117,7 +125,7 @@ class BlockSession extends Block { $sessions_table .= '';
$content .= '
'.$course_title.'
'.$time.'
@@ -157,8 +158,7 @@ class BlockStudent extends Block {
return $content;
}
- public function get_students_content_html_for_drh()
- {
+ public function get_students_content_html_for_drh() {
$attendance = new Attendance();
$students = $this->students;
$content = '
+ $html = '
+
'.get_lang('YourStudents').'
'; @@ -129,7 +130,7 @@ class BlockStudent extends Block { foreach ($courses_by_user as $course) { $course_code = $course['code']; $course_title = $course['title']; - $time = api_time_to_hms(Tracking :: get_time_spent_on_the_course($student['user_id'], $course['real_id'])); + $time = api_time_to_hms(Tracking :: get_time_spent_on_the_course($student['user_id'], $course_code)); $students_table .= '';
@@ -235,6 +235,7 @@ class BlockStudent extends Block {
';
}
$content .= '';
+
return $content;
}
@@ -242,7 +243,8 @@ class BlockStudent extends Block {
* Get number of students
* @return int
*/
- function get_number_of_students() {
+ function get_number_of_students()
+ {
return count($this->students);
}
-}
\ No newline at end of file
+}
diff --git a/plugin/dashboard/block_student_graph/block_student_graph.class.php b/plugin/dashboard/block_student_graph/block_student_graph.class.php
index e88f532865..0314b060b9 100644
--- a/plugin/dashboard/block_student_graph/block_student_graph.class.php
+++ b/plugin/dashboard/block_student_graph/block_student_graph.class.php
@@ -13,6 +13,11 @@
* required files for getting data
*/
+require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
+require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php';
+require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php';
+require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php';
+require_once api_get_path(LIBRARY_PATH).'pchart/MyHorBar.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/gradebookitem.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/evaluation.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/result.class.php';
@@ -24,7 +29,8 @@ require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/category.class.php';
* the class name must be registered inside path.info file (e.g: controller = "BlockStudentGraph"), so dashboard controller will be instantiate it
* @package chamilo.dashboard
*/
-class BlockStudentGraph extends Block {
+class BlockStudentGraph extends Block
+{
private $user_id;
private $students;
@@ -34,7 +40,8 @@ class BlockStudentGraph extends Block {
/**
* Constructor
*/
- public function __construct ($user_id) {
+ public function __construct ($user_id)
+ {
$this->user_id = $user_id;
$this->path = 'block_student_graph';
if ($this->is_block_visible_for_user($user_id)) {
@@ -51,7 +58,8 @@ class BlockStudentGraph extends Block {
* @param int User id
* @return bool Is block visible for user
*/
- public function is_block_visible_for_user($user_id) {
+ public function is_block_visible_for_user($user_id)
+ {
$user_info = api_get_user_info($user_id);
$user_status = $user_info['status'];
$is_block_visible_for_user = false;
@@ -62,14 +70,15 @@ class BlockStudentGraph extends Block {
}
/**
- * This method return content html containing information about students and its position for showing it inside dashboard interface
- * it's important to use the name 'get_block' for beeing used from dashboard controller
+ * This method return content html containing information about students
+ * and its position for showing it inside dashboard interface
+ * it's important to use the name 'get_block' for being used from dashboard controller
* @return array column and content html
*/
- public function get_block() {
+ public function get_block()
+ {
global $charset;
-
$column = 1;
$data = array();
$students_attendance_graph = $this->get_students_attendance_graph();
@@ -90,10 +99,12 @@ class BlockStudentGraph extends Block {
}
/**
- * This method return a graph containing informations about students evaluation, it's used inside get_block method for showing it inside dashboard interface
+ * This method return a graph containing information about students evaluation,
+ * it's used inside get_block method for showing it inside dashboard interface
* @return string img html
*/
- public function get_students_attendance_graph() {
+ public function get_students_attendance_graph()
+ {
$students = $this->students;
$attendance = new Attendance();
@@ -138,7 +149,7 @@ class BlockStudentGraph extends Block {
// prepare cache for saving image
$graph_id = $this->user_id.'StudentEvaluationGraph'; // the graph id
- $cache = new pCache(api_get_path(SYS_ARCHIVE_PATH));
+ $cache = new pCache();
$data = $data_set->GetData(); // return $this->DataDescription
@@ -198,7 +209,8 @@ class BlockStudentGraph extends Block {
* Get number of students
* @return int
*/
- function get_number_of_students() {
+ function get_number_of_students()
+ {
return count($this->students);
}
-}
\ No newline at end of file
+}
diff --git a/plugin/dashboard/block_teacher/block_teacher.class.php b/plugin/dashboard/block_teacher/block_teacher.class.php
index 8ea2b24c5d..5e30feb30f 100644
--- a/plugin/dashboard/block_teacher/block_teacher.class.php
+++ b/plugin/dashboard/block_teacher/block_teacher.class.php
@@ -12,10 +12,12 @@
/**
* This class is used like controller for teacher block plugin,
- * the class name must be registered inside path.info file (e.g: controller = "BlockTeacher"), so dashboard controller will be instantiate it
+ * the class name must be registered inside path.info file
+ * (e.g: controller = "BlockTeacher"), so dashboard controller will be instantiate it
* @package chamilo.dashboard
*/
-class BlockTeacher extends Block {
+class BlockTeacher extends Block
+{
private $user_id;
private $teachers;
@@ -25,15 +27,12 @@ class BlockTeacher extends Block {
/**
* Controller
*/
- public function __construct ($user_id) {
+ public function __construct ($user_id)
+ {
$this->user_id = $user_id;
$this->path = 'block_teacher';
if ($this->is_block_visible_for_user($user_id)) {
- /*if (api_is_platform_admin()) {
- $this->teachers = UserManager::get_user_list(array('status' => COURSEMANAGER));
- } else {*/
- $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
- //}
+ $this->teachers = UserManager::get_users_followed_by_drh($user_id, COURSEMANAGER);
}
}
@@ -42,7 +41,8 @@ class BlockTeacher extends Block {
* @param int User id
* @return bool Is block visible for user
*/
- public function is_block_visible_for_user($user_id) {
+ public function is_block_visible_for_user($user_id)
+ {
$user_info = api_get_user_info($user_id);
$user_status = $user_info['status'];
$is_block_visible_for_user = false;
@@ -57,20 +57,16 @@ class BlockTeacher extends Block {
* it's important to use the name 'get_block' for beeing used from dashboard controller
* @return array column and content html
*/
- public function get_block() {
+ public function get_block()
+ {
global $charset;
-
$column = 1;
- $data = array();
-
- /*if (api_is_platform_admin()) {
- $teacher_content_html = $this->get_teachers_content_html_for_platform_admin();
- } else if (api_is_drh()) {*/
- $teacher_content_html = $this->get_teachers_content_html_for_drh();
- //}
+ $data = array();
+ $teacher_content_html = $this->get_teachers_content_html_for_drh();
- $html = ''.get_lang('TeachersInformationsList').'
@@ -78,29 +74,39 @@ class BlockTeacher extends Block { - '; + + '; $data['column'] = $column; $data['content_html'] = $html; + return $data; + } /** * This method return a content html, it's used inside get_block method for showing it inside dashboard interface * @return string content html */ - public function get_teachers_content_html_for_platform_admin() { + public function get_teachers_content_html_for_platform_admin() + { + $teachers = $this->teachers; $content = '';
$content .= '';
- $teachers_table .= '
'.get_lang('YourTeachers').'
'; - if (count($this->teachers) > 0) { - $teachers_table = '| '.get_lang('User').' | '.get_lang('TimeSpentOnThePlatform').' | '.get_lang('LastConnexion').' | -
|---|---|---|
| '.api_get_person_name($firstname,$lastname).' ('.$username.') | '.$time_on_platform.' | '.$last_connection.' | -
';
$content .= '
'.api_convert_and_format_date($a_last_week[6], DATE_FORMAT_SHORT); - - $teachers_table = '';
- $teachers_table .= '
'.get_lang('YourTeachers').'
'; - - if (count($this->teachers) > 0) { - $a_last_week = Text::get_last_week(); - $last_week = api_convert_and_format_date($a_last_week[0], DATE_FORMAT_SHORT).' '.get_lang('Until').''.api_convert_and_format_date($a_last_week[6], DATE_FORMAT_SHORT); - - $teachers_table = '
| '.get_lang('User').' | '.get_lang('TimeSpentLastWeek').' '.$last_week.' |
-
|---|---|
| '.api_get_person_name($firstname,$lastname).' ('.$username.') | '.$time_on_platform.' |
'.api_convert_encoding(get_lang('GraphicNotAvailable'),'UTF-8').'
'; } + return $graph; } @@ -176,7 +185,9 @@ class BlockTeacherGraph extends Block { * Get number of teachers * @return int */ - function get_number_of_teachers() { + function get_number_of_teachers() + { return count($this->teachers); } -} \ No newline at end of file + +} diff --git a/plugin/date/plugin.php b/plugin/date/plugin.php index 2f0db43ca4..2822ac1cc6 100644 --- a/plugin/date/plugin.php +++ b/plugin/date/plugin.php @@ -1,4 +1,4 @@ -Plugins) @@ -15,4 +15,4 @@ $plugin_info['comment']="Multinational date display"; //the plugin version $plugin_info['version']='1.0'; //the plugin author -$plugin_info['author']='Yannick Warnier'; \ No newline at end of file +$plugin_info['author']='Yannick Warnier'; diff --git a/plugin/ext_auth_chamilo_logout_button_behaviour/index.php b/plugin/ext_auth_chamilo_logout_button_behaviour/index.php index 5da0e9b154..a4749fe7f0 100755 --- a/plugin/ext_auth_chamilo_logout_button_behaviour/index.php +++ b/plugin/ext_auth_chamilo_logout_button_behaviour/index.php @@ -1,9 +1,12 @@ addElement('style_submit_button', 'submit_button', get_lang('Save')); //get default value for form $tab_default_ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_url = api_get_setting('ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_url'); $tab_default_ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_infobulle = api_get_setting('ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_infobulle'); -$tab_default_ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_image = api_get_setting('ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_image'); +$Tab_Default_Ext_Auth_Chamilo_Logout_Button_Behaviour_Eaclbb_Form_Link_Image = api_get_setting('ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_image'); $tab_default_ext_auth_chamilo_logout_button_behaviour_eaclbb_form_alert_onoff = api_get_setting('ext_auth_chamilo_logout_button_behaviour_eaclbb_form_alert_onoff'); $tab_default_ext_auth_chamilo_logout_button_behaviour_eaclbb_form_alert_text = api_get_setting('ext_auth_chamilo_logout_button_behaviour_eaclbb_form_alert_text'); $defaults['eaclbb_form_link_url'] = $tab_default_ext_auth_chamilo_logout_button_behaviour_eaclbb_form_link_url['eaclbb_form_link_url']; @@ -44,5 +43,5 @@ $form->setDefaults($defaults); //display form $plugin_info['settings_form'] = $form; -//set the smarty templates that are going to be used +// Set the templates that are going to be used $plugin_info['templates'] = array('template.tpl'); diff --git a/plugin/formLogin_hide_unhide/plugin.php b/plugin/formLogin_hide_unhide/plugin.php index a9dc57ec72..b7180590bc 100644 --- a/plugin/formLogin_hide_unhide/plugin.php +++ b/plugin/formLogin_hide_unhide/plugin.php @@ -9,8 +9,6 @@ * Plugin details (must be present) */ - - //the plugin title $plugin_info['title'] = 'Hide/Unhide the Login/Password default form'; diff --git a/plugin/hello_world/index.php b/plugin/hello_world/index.php index 3d74c3029f..4b1f02967a 100644 --- a/plugin/hello_world/index.php +++ b/plugin/hello_world/index.php @@ -3,13 +3,13 @@ * @package chamilo.plugin.hello_world */ -// See also the share_user_info plugin +// See also the share_user_info plugin echo '';
if (!empty($plugin_info['settings']['hello_world_show_type'])) {
echo "
@@ -20,11 +21,10 @@ $plugin_info['version'] = '1.0';
//the plugin author
$plugin_info['author'] = 'Julio Montoya';
+/* Plugin optional settings */
-/* Plugin optional settings */
-
-/*
- * This form will be showed in the plugin settings once the plugin was installed
+/*
+ * This form will be showed in the plugin settings once the plugin was installed
* in the plugin/hello_world/index.php you can have access to the value: $plugin_info['settings']['hello_world_show_type']
*/
@@ -33,6 +33,6 @@ $form = new FormValidator('hello_world_form');
//A simple select
$options = array('hello_world' => 'Hello World', 'hello' =>'Hello', 'hi' =>'Hi!');
$form->addElement('select', 'show_type', 'Hello world types', $options);
-$form->addElement('style_submit_button', 'submit_button', get_lang('Save'));
+$form->addElement('style_submit_button', 'submit_button', get_lang('Save'));
-$plugin_info['settings_form'] = $form;
\ No newline at end of file
+$plugin_info['settings_form'] = $form;
diff --git a/plugin/olpc_peru_filter/config.php b/plugin/olpc_peru_filter/config.php
index 296aea80b5..8e2e055145 100644
--- a/plugin/olpc_peru_filter/config.php
+++ b/plugin/olpc_peru_filter/config.php
@@ -3,7 +3,7 @@
/* OLPCPeruFilter parameters that will be registered in the course settings */
-require_once __DIR__.'/../../main/inc/global.inc.php';
+require_once '../../main/inc/global.inc.php';
require_once 'lib/olpc_peru_filter_plugin.class.php';
/**
diff --git a/plugin/openmeetings/config.php b/plugin/openmeetings/config.php
new file mode 100644
index 0000000000..9cc0fba19e
--- /dev/null
+++ b/plugin/openmeetings/config.php
@@ -0,0 +1,12 @@
+install();
diff --git a/plugin/openmeetings/lang/english.php b/plugin/openmeetings/lang/english.php
new file mode 100644
index 0000000000..c40460a28e
--- /dev/null
+++ b/plugin/openmeetings/lang/english.php
@@ -0,0 +1,57 @@
+
+ */
+
+//Needed in order to show the plugin title
+$strings['plugin_title'] = "OpenMeetings";
+$strings['plugin_comment'] = "Add a videoconference room in a Chamilo course using OpenMeetings";
+
+$strings['Videoconference'] = "Videoconference";
+$strings['MeetingOpened'] = "Meeting opened";
+$strings['MeetingClosed'] = "Meeting closed";
+$strings['MeetingClosedComment'] = "If you have asked for your sessions to be recorded, the recording will be available in the list below when it has been completely generated.";
+$strings['CloseMeeting'] = "Close meeting";
+
+$strings['MeetingDeleted'] = "Delete meeting";
+$strings['MeetingDeletedComment'] = "";
+
+$strings['VideoConferenceXCourseX'] = "Videoconference #%s course %s";
+$strings['VideoConferenceAddedToTheCalendar'] = "Videoconference added to the calendar";
+$strings['VideoConferenceAddedToTheLinkTool'] = "Videoconference added to the link tool";
+
+$strings['GoToTheVideoConference'] = "Go to the videoconference";
+
+$strings['Records'] = "Recording";
+$strings['Meeting'] = "Meeting";
+
+$strings['ViewRecord'] = "View recording";
+$strings['CopyToLinkTool'] = "Copy to link tool";
+
+$strings['EnterConference'] = "Enter the videoconference";
+$strings['RecordList'] = "Recording list";
+$strings['ServerIsNotRunning'] = "Videoconference server is not running";
+$strings['ServerIsNotConfigured'] = "Videoconference server is not configured";
+
+$strings['XUsersOnLine'] = "%s user(s) online";
+
+$strings['host'] = 'OpenMeetings host';
+$strings['host_help'] = 'This is the full address of your OpenMeeetings server interface. Might be http://localhost:5080/openmeetings, an IP address (e.g. http://192.168.13.54:5080/openmeetings) or a domain name (e.g. http://my.video.com:5080/openmeetings).';
+
+$strings['salt'] = 'OpenMeetings salt';
+$strings['salt_help'] = 'This is the security key of your OpenMeetings server, which will allow your server to authentify the Chamilo installation. Refer to the OpenMeetings documentation to locate it.';
+
+$strings['tool_enable'] = 'OpenMeetings videoconference tool enabled';
+$strings['tool_enable_help'] = 'Choose whether you want to enable the OpenMeetings videoconference tool. Once enabled, it will show as an additional course tool in all courses homepage, and teachers will be able to launch a conference at any time. Students will not be able to launch a conference, only join one. If you don\'t have an OpenMeetings server, please set one up or ask the Chamilo official providers for a quote. OpenMeetings is a free (as in freedom *and* beer), but its installation requires a set of technical skills that might not be immediately available to all. You can install it on your own or seek professional help to assist you or do it for you. This help, however, will generate a certain cost. In the pure logic of the free software, we offer you the tools to make your work easier and recommend professionals (the Chamilo Official Providers) that will be able to help you if this were too difficult.
'; + +$strings['openmeetings_welcome_message'] = 'Welcome message'; +$strings['openmeetings_record_and_store'] = 'Record and store sessions'; + +$strings['plugin_tool_openmeetings'] = 'Video'; + +$strings['ThereAreNotRecordingsForTheMeetings'] = 'There are not recording for the meeting sessions'; +$strings['NoRecording'] = 'No recording'; + diff --git a/plugin/openmeetings/lang/french.php b/plugin/openmeetings/lang/french.php new file mode 100644 index 0000000000..21f8fd140d --- /dev/null +++ b/plugin/openmeetings/lang/french.php @@ -0,0 +1,50 @@ +en installer un avant de poursuivre, ou demander un devis à l'un des fournisseurs officiels de Chamilo. OpenMeetings est un outil de logiciel libre (et gratuit), mais son installation pourrait présenter une certaine complexité et demander des compétences qui ne sont peut-être pas à la portée de tous. Vous pouvez l'installer vous-même à partir de la documentation (disponible publiquement) de OpenMeetings, ou recherchez un soutien professionnel. Ce soutien pourrait générer certains coûts (au moins le temps de la personne qui vous assiste dans l'opération). Dans le plus pur esprit du logiciel libre, nous vous fournissons les outils pour simplifier votre travail dans la mesure de nos possibilités, et nous vous recommandons des professionnels (les fournisseurs officiels de Chamilo) pour vous venir en aide au cas où ceux-ci seraient insuffisants.
"; + +$strings['openmeetings_welcome_message'] = 'Message de bienvenue de OpenMeetings'; +$strings['openmeetings_record_and_store'] = 'Enregistrer les sessions de vidéoconférence'; + +$strings['plugin_tool_openmeetings'] = 'Vidéo'; + +$strings['ThereAreNotRecordingsForTheMeetings'] = 'Aucun enregistrement disponible'; +$strings['NoRecording'] = "Pas d'enregistrement"; + diff --git a/plugin/openmeetings/lang/spanish.php b/plugin/openmeetings/lang/spanish.php new file mode 100644 index 0000000000..4195abb3d5 --- /dev/null +++ b/plugin/openmeetings/lang/spanish.php @@ -0,0 +1,53 @@ +configure uno antes de seguir, o pida una cotización a uno de los proveedores oficiales de Chamilo. OpenMeetings es una herramienta de software libre (y gratuita), pero su instalación requiere de competencias que quizás no sean inmediatamente disponibles para todos. Puede instalarla usted mismo o buscar ayuda profesional. Esta ayuda podrÃa no obstante generar algunos costos (por lo menos el tiempo de la persona quien lo ayude). En el puro espÃritu del software libre, le ofrecemos las herramientas para hacer su trabajo más simple, en la medida de nuestras posibilidades, y le recomendamos profesionales (los proveedores oficiales de Chamilo) para ayudarlo en caso esto fuera demasiado complicado.
'; + +$strings['openmeetings_welcome_message'] = 'Mensaje de bienvenida de '; +$strings['openmeetings_record_and_store'] = 'Grabar las sesiones de videoconferencia'; + +$strings['plugin_tool_openmeetings'] = 'Video'; + +$strings['ThereAreNotRecordingsForTheMeetings'] = 'No hay grabaciones de sesiones de videoconferencia'; +$strings['NoRecording'] = 'No hay grabación'; + diff --git a/plugin/openmeetings/lib/openmeetings.class.php b/plugin/openmeetings/lib/openmeetings.class.php new file mode 100644 index 0000000000..3d1e24e7ca --- /dev/null +++ b/plugin/openmeetings/lib/openmeetings.class.php @@ -0,0 +1,631 @@ +get('tool_enable'); + $om_host = $plugin->get('host'); + $om_user = $plugin->get('user'); + $om_pass = $plugin->get('pass'); + $accessUrl = api_get_access_url($_configuration['access_url']); + $this->externalType = substr($accessUrl['url'], strpos($accessUrl['url'], '://')+3, -1); + if (strcmp($this->externalType, 'localhost') == 0) { + $this->externalType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH), '://')+3, -1); + } + $this->externalType = 'chamilolms.'.$this->externalType; + $this->table = \Database::get_main_table('plugin_openmeetings'); + + if ($om_plugin) { + $user_info = api_get_user_info(); + $this->user_complete_name = $user_info['complete_name']; + $this->user = $om_user; + $this->pass = $om_pass; + $this->url = $om_host; + + // Setting OM api + define('CONFIG_OPENMEETINGS_USER', $this->user); + define('CONFIG_OPENMEETINGS_PASS', $this->pass); + define('CONFIG_OPENMEETINGS_SERVER_URL', $this->url); + + $this->gateway = new \OpenMeetingsGateway($this->url, $this->user, $this->pass); + $this->plugin_enabled = $om_plugin; + // The room has a name composed of C + course ID + '-' + session ID + $this->chamiloCourseId = api_get_course_int_id(); + $this->chamiloSessionId = api_get_session_id(); + $this->roomName = 'C'.$this->chamiloCourseId.'-'.$this->chamiloSessionId; + $return = $this->gateway->loginUser(); + if ($return == 0) { + $msg = 'Could not initiate session with server through OpenMeetingsGateway::loginUser()'; + error_log(__FILE__.'+'.__LINE__.': '.$msg); + die($msg); + } + $this->sessionId = $this->gateway->sessionId; + } + } + + /** + * Checks whether a user is teacher in the current course + * @return bool True if the user can be considered a teacher in this course, false otherwise + */ + public function isTeacher() + { + return api_is_course_admin() || api_is_coach() || api_is_platform_admin(); + } + + /** + * Login the user with OM Server. This generates a session ID that is + * specific to the current user, but that does not require specific user data + * + * It is similar to opening a PHP session. In fact, the session ID is kept + * inside the $_SESSION['openmeetings_session'] session variable + * @return bool True if the user is correct and false when is incorrect + * @deprecated loginUser now called at object instanciation + */ + /** + function loginUser() + { + try { + //Verifying if there is already an active session + if (empty($_SESSION['openmeetings_session'])) { + // Login user returns either 0 or >0, depending on the results + // Technically, as long as the SOAP user has been configured in OpenMeetings and OpenMeetings is on, this should always succeed. + if ($this->gateway->loginUser()) { + $this->sessionId = $_SESSION['openmeetings_session'] = $this->gateway->session_id; + return true; + } else { + error_log('loginUser did not succeed'); + return false; + } + } else { + $this->sessionId = $_SESSION['openmeetings_session']; + return true; + } + } catch (SoapFault $e) { + error_log(__FILE__.'+'.__LINE__.' Warning: We have detected some problems. Fault: '.$e->faultstring); + return false; + } + } + */ + + /* + * Creating a Room for the meeting + * @return bool True if the user is correct and false when is incorrect + */ + public function createMeeting($params) + { + global $_configuration; + // First, try to see if there is an active room for this course and session. + $roomId = null; + + $meetingData = \Database::select( + '*', + $this->table, + array( + 'where' => + array( + 'c_id = ?' => $this->chamiloCourseId, + ' AND session_id = ? ' => $this->chamiloSessionId, + ' AND status <> ? ' => 2, + + ) + ), + 'first' + ); + + if ($meetingData != false && count($meetingData) > 0) { + //error_log(print_r($meetingData,1)); + //error_log('Found previous room reference - reusing'); + // There has been a room in the past for this course. It should + // still be on the server, so update (instead of creating a new one) + // This fills the following attributes: status, name, comment, chamiloCourseId, chamiloSessionId + $room = new Room(); + $room->loadRoomId($meetingData['room_id']); + $roomArray = (array)$room; + $roomArray['SID'] = $this->sessionId; + $roomId = $this->gateway->updateRoomWithModeration($room); + if ($roomId != $meetingData['room_id']) { + $msg = 'Something went wrong: the updated room ID ('.$roomId.') is not the same as the one we had ('.$meetingData['room_id'].')'; + error_log($msg); + die($msg); + } + + } else { + //error_log('Found no previous room - creating'); + $room = new Room(); + $room->SID = $this->sessionId; + $room->name = $this->roomName; + //$room->roomtypes_id = $room->roomtypes_id; + $room->comment = urlencode(get_lang('Course').': ' . $params['meeting_name'] . ' - '.$_configuration['software_name']); + //$room->numberOfPartizipants = $room->numberOfPartizipants; + $room->ispublic = $room->getString('isPublic', 'false'); + //$room->appointment = $room->getString('appointment'); + //$room->isDemoRoom = $room->getString('isDemoRoom'); + //$room->demoTime = $room->demoTime; + //$room->isModeratedRoom = $room->getString('isModeratedRoom'); + $roomId = $this->gateway->createRoomWithModAndType($room); + } + + if (!empty($roomId)) { + /* + // Find the biggest room_id so far, and create a new one + if (empty($roomId)) { + $roomData = \Database::select('MAX(room_id) as room_id', $this->table, array(), 'first'); + $roomId = $roomData['room_id'] + 1; + }*/ + + $params['status'] = '1'; + $params['meeting_name'] = $room->name; + $params['created_at'] = api_get_utc_datetime(); + $params['room_id'] = $roomId; + $params['c_id'] = api_get_course_int_id(); + $params['session_id'] = api_get_session_id(); + $params['record'] = ($room->allowRecording?1:0); + + $id = \Database::insert($this->table, $params); + + $this->joinMeeting($id); + } else { + return -1; + } + } + + /** + * Returns a meeting "join" URL + * @param string The name of the meeting (usually the course code) + * @return mixed The URL to join the meeting, or false on error + * @todo implement moderator pass + * @assert ('') === false + * @assert ('abcdefghijklmnopqrstuvwxyzabcdefghijklmno') === false + */ + public function joinMeeting($meetingId) + { + if (empty($meetingId)) { + return false; + } + $meetingData = \Database::select( + '*', + $this->table, + array('where' => array('id = ? AND status = 1 ' => $meetingId)), + 'first' + ); + + if (empty($meetingData)) { + if ($this->debug) { + error_log("meeting does not exist: $meetingId "); + } + return false; + } + $params = array('room_id' => $meetingData['room_id']); + $returnVal = $this->setUserObjectAndGenerateRoomHashByURLAndRecFlag($params); + $iframe = $this->url . "/?" ."secureHash=" . $returnVal; + printf("", $iframe, "100%", 640); + } + + /** + * Checks if the videoconference server is running. + * Function currently disabled (always returns 1) + * @return bool True if server is running, false otherwise + * @assert () === false + */ + public function isServerRunning() + { + // Always return true for now as this requires the openmeetings object + // to have been instanciated and this includes a loginUser() which + // connects to the server + return true; + } + + /** + * Gets the password for a specific meeting for the current user + * @return string A moderator password if user is teacher, or the course code otherwise + */ + public function getMeetingUserPassword() + { + if ($this->isTeacher()) { + return $this->getMeetingModerationPassword(); + } else { + return api_get_course_id(); + } + } + + /** + * Generated a moderator password for the meeting + * @return string A password for the moderation of the video conference + */ + public function getMeetingModerationPassword() + { + return api_get_course_id().'mod'; + } + + /** + * Get information about the given meeting + * @param array ...? + * @return mixed Array of information on success, false on error + * @assert (array()) === false + */ + public function getMeetingInfo($params) + { + try { + $result = $this->api->getMeetingInfoArray($params); + if ($result == null) { + if ($this->debug) { + error_log(__FILE__.'+'.__LINE__." Failed to get any response. Maybe we can't contact the OpenMeetings server."); + } + } else { + return $result; + } + } catch (Exception $e) { + if ($this->debug) { + error_log(__FILE__.'+'.__LINE__.' Caught exception: ', $e->getMessage(), "\n"); + } + } + return false; + } + + /** + * @param array $params Array of parameters + * @return mixed + */ + public function setUserObjectAndGenerateRecordingHashByURL($params) + { + $username = $_SESSION['_user']['username']; + $firstname = $_SESSION['_user']['firstname']; + $lastname = $_SESSION['_user']['lastname']; + $userId = $_SESSION['_user']['user_id']; + $systemType = 'chamilo'; + $room_id = $params['room_id']; + + $urlWsdl = $this->url."/services/UserService?wsdl"; + $omServices = new \SoapClient($urlWsdl); + $objRec = new User(); + + $objRec->SID = $this->sessionId; + $objRec->username = $username; + $objRec->firstname = $firstname; + $objRec->lastname = $lastname; + $objRec->externalUserId = $userId; + $objRec->externalUserType = $systemType; + $objRec->recording_id = $recording_id; + $orFn = $omServices->setUserObjectAndGenerateRecordingHashByURL($objRec); + + return $orFn->return; + } + + /** + * @param Array $params Array of parameters + * @return mixed + */ + public function setUserObjectAndGenerateRoomHashByURLAndRecFlag($params) + { + $username = $_SESSION['_user']['username']; + $firstname = $_SESSION['_user']['firstname']; + $lastname = $_SESSION['_user']['lastname']; + $profilePictureUrl = $_SESSION['_user']['avatar']; + $email = $_SESSION['_user']['mail']; + $userId = $_SESSION['_user']['user_id']; + $systemType = 'Chamilo'; + $room_id = $params['room_id']; + $becomeModerator = ( $this->isTeacher() ? 1 : 0 ); + $allowRecording = 1; //Provisional + + $urlWsdl = $this->url."/services/UserService?wsdl"; + $omServices = new \SoapClient($urlWsdl); + $objRec = new User(); + + $objRec->SID = $this->sessionId; + $objRec->username = $username; + $objRec->firstname = $firstname; + $objRec->lastname = $lastname; + $objRec->profilePictureUrl = $profilePictureUrl; + $objRec->email = $email; + $objRec->externalUserId = $userId; + $objRec->externalUserType = $systemType; + $objRec->room_id = $room_id; + $objRec->becomeModeratorAsInt = $becomeModerator; + $objRec->showAudioVideoTestAsInt = 1; + $objRec->allowRecording = $allowRecording; + $rcFn = $omServices->setUserObjectAndGenerateRoomHashByURLAndRecFlag($objRec); + + return $rcFn->return; + } + + /** + * Gets all the course meetings saved in the plugin_openmeetings table + * @return array Array of current open meeting rooms + */ + public function getCourseMeetings() + { + $newMeetingsList = array(); + $item = array(); + $meetingsList = \Database::select( + '*', + $this->table, + array('where' => + array( + 'c_id = ? ' => api_get_course_int_id(), + ' AND session_id = ? ' => api_get_session_id(), + ' AND status <> ? ' => 2 // status deleted + ) + ) + ); + /*$urlWsdl = $this->url."/services/RoomService?wsdl"; + $omServices = new \SoapClient($urlWsdl);*/ + $room = new Room(); + + /* + try { + $rooms = $this->gateway->getRoomsWithCurrentUsersByType(); + //$rooms = $omServices->getRoomsPublic(array( + //'SID' => $this->sessionId, + //'start' => 0, + //'max' => 10, + //'orderby' => 'name', + //'asc' => 'true', + //'externalRoomType' => 'chamilo', + //'roomtypes_id' => 'chamilo', + //) + //); + } catch (SoapFault $e) { + error_log(__FILE__.'+'.__LINE__.' '.$e->faultstring); + //error_log($rooms->getDebug()); + return false; + } + */ + $room->SID = $this->sessionId; + //error_log(__FILE__.'+'.__LINE__.' Meetings found: '.print_r($room->SID,1)); + if (!empty($meetingsList)) { + foreach ($meetingsList as $meetingDb) { + //$room->rooms_id = $meetingDb['room_id']; + error_log(__FILE__.'+'.__LINE__.' Meetings found: '.print_r($meetingDb, 1)); + $remoteMeeting = array(); + $meetingDb['created_at'] = api_get_local_time($meetingDb['created_at']); + $meetingDb['closed_at'] = (!empty($meetingDb['closed_at']) ? api_get_local_time($meetingDb['closed_at']):''); + // Fixed value for now + $meetingDb['participantCount'] = 40; + $rec = $this->gateway->getFlvRecordingByRoomId($meetingDb['room_id']); + $links = array(); + // Links to videos look like these: + // http://video2.openmeetings.com:5080/openmeetings/DownloadHandler?fileName=flvRecording_4.avi&moduleName=lzRecorderApp&parentPath=&room_id=&sid=dfc0cac396d384f59242aa66e5a9bbdd + $link = $this->url.'/DownloadHandler?fileName=%s&moduleName=lzRecorderApp&parentPath=&room_id=%s&sid=%s'; + if (!empty($rec)) { + $link1 = sprintf($link, $rec['fileHash'], $meetingDb['room_id'], $this->sessionId); + $link2 = sprintf($link, $rec['alternateDownload'], $meetingDb['room_id'], $this->sessionId); + $links[] = $rec['fileName'].' '. + \Display::url('[.flv]', $link1, array('target' => '_blank')).' '. + \Display::url('[.avi]', $link2, array('target' => '_blank')); + + } + $item['show_links'] = implode('
', $links); + + // The following code is currently commented because the web service + // says this is not allowed by the SOAP user. + /* + try { + // Get the conference room object from OpenMeetings server - requires SID and rooms_id to be defined + $objRoomId = $this->gateway->getRoomById($meetingDb['room_id']); + if (empty($objRoomId->return)) { + error_log(__FILE__.'+'.__LINE__.' Emptyyyyy '); + //\Database::delete($this->table, "id = {$meetingDb['id']}"); + // Don't delete expired rooms, just mark as closed + \Database::update($this->table, array('status' => 0, 'closed_at' => api_get_utc_datetime()), array('id = ? ' => $meetingDb['id'])); + continue; + } + //$objCurUs = $omServices->getRoomWithCurrentUsersById($objCurrentUsers); + } catch (SoapFault $e) { + error_log(__FILE__.'+'.__LINE__.' '.$e->faultstring); + exit; + } + //if( empty($objCurUs->returnMeetingID) ) continue; + + $current_room = array( + 'roomtype' => $objRoomId->return->roomtype->roomtypes_id, + 'meetingName' => $objRoomId->return->name, + 'meetingId' => $objRoomId->return->meetingID, + 'createTime' => $objRoomId->return->rooms_id, + 'showMicrophoneStatus' => $objRoomId->return->showMicrophoneStatus, + 'attendeePw' => $objRoomId->return->attendeePW, + 'moderatorPw' => $objRoomId->return->moderators, + 'isClosed' => $objRoomId->return->isClosed, + 'allowRecording' => $objRoomId->return->allowRecording, + 'startTime' => $objRoomId->return->startTime, + 'endTime' => $objRoomId->return->updatetime, + 'participantCount' => count($objRoomId->return->currentusers), + 'maxUsers' => $objRoomId->return->numberOfPartizipants, + 'moderatorCount' => count($objRoomId->return->moderators) + ); + // Then interate through attendee results and return them as part of the array: + if (!empty($objRoomId->return->currentusers)) { + foreach ($objRoomId->return->currentusers as $a) + $current_room[] = array( + 'userId' => $a->username, + 'fullName' => $a->firstname . " " . $a->lastname, + 'isMod' => $a->isMod + ); + } + $remoteMeeting = $current_room; + */ + + if (empty( $remoteMeeting )) { + /* + error_log(__FILE__.'+'.__LINE__.' Empty remote Meeting for now'); + if ($meetingDb['status'] == 1 && $this->isTeacher()) { + $this->endMeeting($meetingDb['id']); + } + */ + } else { + $remoteMeeting['add_to_calendar_url'] = api_get_self().'?action=add_to_calendar&id='.$meetingDb['id'].'&start='.api_strtotime($meetingDb['startTime']); + } + $remoteMeeting['end_url'] = api_get_self().'?action=end&id='.$meetingDb['id']; + $remoteMeeting['delete_url'] = api_get_self().'?action=delete&id='.$meetingDb['id']; + + //$record_array = array(); + + // if ($meetingDb['record'] == 1) { + // $recordingParams = array( + // 'meetingId' => $meetingDb['id'], //-- OPTIONAL - comma separate if multiple ids + // ); + // + // $records = $this->api->getRecordingsWithXmlResponseArray($recordingParams); + // if (!empty($records)) { + // $count = 1; + // if (isset($records['message']) && !empty($records['message'])) { + // if ($records['messageKey'] == 'noRecordings') { + // $record_array[] = get_lang('NoRecording'); + // } else { + // //$record_array[] = $records['message']; + // } + // } else { + // foreach ($records as $record) { + // if (is_array($record) && isset($record['recordId'])) { + // $url = Display::url(get_lang('ViewRecord'), $record['playbackFormatUrl'], array('target' => '_blank')); + // if ($this->is_teacher()) { + // $url .= Display::url(Display::return_icon('link.gif',get_lang('CopyToLinkTool')), api_get_self().'?action=copy_record_to_link_tool&id='.$meetingDb['id'].'&record_id='.$record['recordId']); + // $url .= Display::url(Display::return_icon('agenda.png',get_lang('AddToCalendar')), api_get_self().'?action=add_to_calendar&id='.$meetingDb['id'].'&start='.api_strtotime($meetingDb['created_at']).'&url='.$record['playbackFormatUrl']); + // $url .= Display::url(Display::return_icon('delete.png',get_lang('Delete')), api_get_self().'?action=delete_record&id='.$record['recordId']); + // } + // //$url .= api_get_self().'?action=publish&id='.$record['recordID']; + // $count++; + // $record_array[] = $url; + // } else { + // + // } + // } + // } + // } + // //var_dump($record_array); + // $item['show_links'] = implode('
', $record_array); + // + // } + // + //$item['created_at'] = api_convert_and_format_date($meetingDb['created_at']); + // //created_at + // + // $item['publish_url'] = api_get_self().'?action=publish&id='.$meetingDb['id']; + // $item['unpublish_url'] = api_get_self().'?action=unpublish&id='.$meetingDb['id']; + // + //if ($meetingDb['status'] == 1) { + // $joinParams = array( + // 'meetingId' => $meetingDb['id'], //-- REQUIRED - A unique id for the meeting + // 'username' => $this->user_complete_name, //-- REQUIRED - The name that will display for the user in the meeting + // 'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here + // 'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly. + // 'userID' => '', // -- OPTIONAL - string + // 'webVoiceConf' => '' // -- OPTIONAL - string + // ); + // $returnVal = $this->setUserObjectAndGenerateRoomHashByURLAndRecFlag( array('room_id' => $meetingDb['id']) ); + // $joinUrl = CONFIG_OPENMEETINGS_SERVER_URL . "?" . + // "secureHash=" . $returnVal; + // + // $item['go_url'] = $joinUrl; + //} + $item = array_merge($item, $meetingDb, $remoteMeeting); + //error_log(__FILE__.'+'.__LINE__.' Item: '.print_r($item,1)); + $newMeetingsList[] = $item; + } //end foreach $meetingsList + } + + return $newMeetingsList; + } + + /** + * Send a command to the OpenMeetings server to close the meeting + * @param int $meetingId + * @return int + */ + public function endMeeting($meetingId) + { + try { + $room = new Room($meetingId); + $room->SID = $this->sessionId; + $room->room_id = intval($meetingId); + $room->status = false; + + $urlWsdl = $this->url."/services/RoomService?wsdl"; + $ws = new \SoapClient($urlWsdl); + + $roomClosed = $ws->closeRoom($room); + if ($roomClosed > 0) { + \Database::update( + $this->table, + array( + 'status' => 0, + 'closed_at' => api_get_utc_datetime() + ), + array('id = ? ' => $meetingId) + ); + } + //error_log(__FILE__.'+'.__LINE__.' Finished closing'); + } catch (SoapFault $e) { + error_log(__FILE__.'+'.__LINE__.' Warning: We have detected some problems: Fault: '.$e->faultstring); + exit; + return -1; + } + } + + /** + * @param int $id + * @return int + */ + public function deleteMeeting($id) + { + try { + $room = new Room(); + $room->loadRoomId($id); + $this->gateway->deleteRoom($room); + \Database::update( + $this->table, + array( + 'status' => 2 + ), + array('id = ? ' => $id) + ); + return $id; + //error_log(__FILE__.'+'.__LINE__.' Finished closing'); + } catch (SoapFault $e) { + error_log(__FILE__.'+'.__LINE__.' Warning: We have detected some problems: Fault: '.$e->faultstring); + exit; + return -1; + } + } +} diff --git a/plugin/openmeetings/lib/openmeetings_api.php b/plugin/openmeetings/lib/openmeetings_api.php new file mode 100644 index 0000000000..af4551eb9e --- /dev/null +++ b/plugin/openmeetings/lib/openmeetings_api.php @@ -0,0 +1,24 @@ +_user = CONFIG_OPENMEETINGS_USER; + $this->_pass = CONFIG_OPENMEETINGS_PASS; + $this->_serverBaseUrl = CONFIG_OPENMEETINGS_SERVER_URL; + } +} diff --git a/plugin/openmeetings/lib/openmeetings_gateway.php b/plugin/openmeetings/lib/openmeetings_gateway.php new file mode 100644 index 0000000000..8f8af447f7 --- /dev/null +++ b/plugin/openmeetings/lib/openmeetings_gateway.php @@ -0,0 +1,474 @@ +_user = urlencode($user); + $this->_pass = urlencode($pass); + $this->_url = $host; + if (substr($this->_url, -1, 1) == '/') { + $this->_url = substr($this->_url, 0, -1); + } + $this->rest = new OpenMeetingsRestService(); + $err = $this->rest->getError(); + if ($err) { + error_log('Constructor error: ' . $err); + error_log('Debug: ' . $this->rest->getDebug());; + exit(); + } + } + + /** + * @param string $name + * @return string + */ + public function getRestUrl($name) + { + return $this->getUrl() . "/services/" . $name . "/"; + } + + /** + * @return string + */ + public function getUrl() + { + return $this->_url; + } + + /** + * @param bool $in + * @return string + */ + public function var_to_str($in) + { + if (is_bool($in)) { + return $in ? "true" : "false"; + } else { + return $in; + } + } + + /** + * TODO: Get Error Service and show detailed Error Message + */ + public function loginUser() + { + $returnValue = 0; + $response = $this->rest->call($this->getRestUrl("UserService") . "getSession", "session_id"); + + if ($this->rest->getError()) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($response, 1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error: ' . $err); + } else { + //error_log('getSession returned '.$response. ' - Storing as sessionId'); + $this->sessionId = $response; + + $url = $this->getRestUrl("UserService") + . "loginUser?" + . "SID=" . $this->sessionId + . "&username=" . $this->_user + . "&userpass=" . $this->_pass; + $result = $this->rest->call($url); + if ($this->rest->getError()) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($result, 1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error '. $err); + } else { + $returnValue = $result; + } + } + } + } + + if ($returnValue > 0) { + return true; + } else { + return false; + } + } + + /** + * @param Room $room + * @return array|bool|int|null + */ + public function updateRoomWithModeration($room) + { + $err = $this->rest->getError(); + if ($err) { + error_log('Constructor error: ' . $err); + error_log('Debug: ' . $this->rest->getDebug()); + exit(); + } + + $isModeratedRoom = false; + if ($room->isModeratedRoom == 1) { + $isModeratedRoom = true; + } + + $url = $this->getRestUrl($this->getRestUrl("RoomService") + . "updateRoomWithModeration?SID=" . $this->sessionId + . "&room_id=" . $room->room_id + . "&name=" . urlencode($room->name) + . "&roomtypes_id=" . $room->roomtypes_id + . "&comment=" . $room->comment + . "&numberOfPartizipants=" . $room->numberOfPartizipants + . "&ispublic=false" + . "&appointment=false" + . "&isDemoRoom=false" + . "&demoTime=0" + . "&isModeratedRoom=" . $this->var_to_str($isModeratedRoom)); + //error_log($url); + $result = $this->rest->call($url); + + if ($result->fault) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($result, 1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error: ' . $err); + } else { + // echo '
"; + return $this->getArray($dom); + } else { + $returnNodeList = $dom->getElementsByTagName($returnAttribute); + $ret = array(); + foreach ($returnNodeList as $returnNode) { + if ($returnNodeList->length == 1) { + return $this->getArray($returnNode); + } else { + $ret[] = $this->getArray($returnNode); + } + } + return $ret; + } + + } + + function getArray($node) + { + if (is_null($node) || !is_object($node)) { + return $node; + } + $array = false; + /* + echo("!!!!!!!! NODE " . XML_TEXT_NODE + . " :: name = " . $node->nodeName + . " :: local = " . $node->localName + . " :: childs ? " . $node->hasChildNodes() + . " :: count = " . ($node->hasChildNodes() ? $node->childNodes->length : -1) + . " :: type = " . $node->nodeType + . " :: val = " . $node->nodeValue + . "\n"); + /* + if ($node->hasAttributes()) { + foreach ($node->attributes as $attr) { + $array[$attr->nodeName] = $attr->nodeValue; + } + } + */ + if ($node->hasChildNodes()) { + foreach ($node->childNodes as $childNode) { + if ($childNode->nodeType != XML_TEXT_NODE) { + if ($node->hasAttributes()) { + foreach ($node->attributes as $attr) { + if ($attr->localName == "nil") { + return null; + } + } + } + if ($childNode->childNodes->length == 1) { + $array[$childNode->localName] = $this->getArray($childNode); + } else { + $array[$childNode->localName][] = $this->getArray($childNode); + } + } else { + return $childNode->nodeValue; + //echo("!!!!!!!! TEXT " . $childNode->nodeValue . "\n"); + //$array[$childNode->localName] + } + } + } + + return $array; + } + + function getError() + { + return false; + } + + function fault() + { + return false; + } +} \ No newline at end of file diff --git a/plugin/openmeetings/lib/room.class.php b/plugin/openmeetings/lib/room.class.php new file mode 100644 index 0000000000..5433f4792d --- /dev/null +++ b/plugin/openmeetings/lib/room.class.php @@ -0,0 +1,115 @@ +isTeacher() ) ? 1 : 2 ; + */ + public $roomtypes_id = 1; + public $comment; + public $numberOfPartizipants = 40; + public $ispublic = false; + public $appointment = false; + public $isDemoRoom = false; + public $demoTime = 0; + public $isModeratedRoom = true; + public $externalRoomType = 'chamilolms'; + public $allowUserQuestions = false; + public $isAudioOnly = false; + public $waitForRecording = true; + public $allowRecording = true; + public $chamiloCourseId; + public $chamiloSessionId; + private $table; + + public function __construct() + { + $this->table = \Database::get_main_table('plugin_openmeetings'); + global $_configuration; + $this->name = 'C'.api_get_real_course_id().'-'.api_get_session_id(); + $accessUrl = api_get_access_url($_configuration['access_url']); + $this->externalRoomType = substr($accessUrl['url'], strpos($accessUrl['url'],'://')+3,-1); + if (strcmp($this->externalRoomType, 'localhost') == 0) { + $this->externalRoomType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH),'://')+3, -1); + } + $this->externalRoomType = 'chamilolms.'.$this->externalRoomType; + } + + /** + * Get Room by id + * @param int $id + */ + public function getRoom($id) + { + if (!empty($id)) { + $roomData = \Database::select('*', $this->table, array('where' => array('id = ?' => $id)), 'first'); + if (!empty($roomData)) { + $this->rooms_id = $this->room_id = $roomData['room_id']; + $this->status = $roomData['status']; + $this->name = $roomData['meeting_name']; + $this->comment = $roomData['welcome_msg']; + $this->allowRecording = $roomData['record']; + $this->chamiloCourseId = $roomData['c_id']; + $this->chamiloSessionId = $roomData['session_id']; + } + } + } + + /** + * Sets the room ID and loads as much info as possible from the local table + * @param int $id The room ID (from table.room_id) + */ + public function loadRoomId($id) + { + if (!empty($id)) { + $roomData = \Database::select('*', $this->table, array('where' => array('room_id = ?' => $id)), 'last'); + if (!empty($roomData)) { + $this->rooms_id = $this->room_id = $roomData['room_id']; + $this->status = $roomData['status']; + $this->name = $roomData['meeting_name']; + $this->comment = $roomData['welcome_msg']; + $this->allowRecording = $roomData['record']; + $this->chamiloCourseId = $roomData['c_id']; + $this->chamiloSessionId = $roomData['session_id']; + } + } + } + + /** + * Gets a string from a boolean attribute + * @param string $attribute Name of the attribute + * @param mixed $voidReturn What to return if the value is not defined + * @return string The boolean value expressed as string ('true' or 'false') + */ + public function getString($attribute, $voidReturn = false) + { + if (empty($attribute)) { + return false; + } + if (!isset($this->$attribute)) { + return $voidReturn; + } + return $this->$attribute?'true':'false'; + } +} diff --git a/plugin/openmeetings/lib/session.class.php b/plugin/openmeetings/lib/session.class.php new file mode 100644 index 0000000000..f78123df46 --- /dev/null +++ b/plugin/openmeetings/lib/session.class.php @@ -0,0 +1,16 @@ +get_lang('Videoconference'); +$tpl = new Template($tool_name); + +$om = new Chamilo\Plugin\OpenMeetings\OpenMeetings(); +$action = isset($_GET['action']) ? $_GET['action'] : null; +$teacher = $om->isTeacher(); + +api_protect_course_script(true); +$message = null; + +if ($teacher) { + switch ($action) { + case 'add_to_calendar': + $course_info = api_get_course_info(); + $agenda = new Agenda(); + $agenda->type = 'course'; + + $id = intval($_GET['id']); + $title = sprintf(get_lang('VideoConferenceXCourseX'), $id, $course_info['name']); + $content = Display::url(get_lang('GoToTheVideoConference'), $_GET['url']); + + $event_id = $agenda->add_event($_REQUEST['start'], null, 'true', null, $title, $content, array('everyone')); + if (!empty($event_id)) { + $message = Display::return_message(get_lang('VideoConferenceAddedToTheCalendar'), 'success'); + } else { + $message = Display::return_message(get_lang('Error'), 'error'); + } + break; + case 'copy_record_to_link_tool': + $result = $om->copy_record_to_link_tool($_GET['id'], $_GET['record_id']); + if ($result) { + $message = Display::return_message(get_lang('VideoConferenceAddedToTheLinkTool'), 'success'); + } else { + $message = Display::return_message(get_lang('Error'), 'error'); + } + break; + case 'delete_record': + /*$result = $om->delete_record($_GET['id']); + if ($result) { + $message = Display::return_message(get_lang('Deleted'), 'success'); + } else { + $message = Display::return_message(get_lang('Error'), 'error'); + }*/ + break; + case 'delete': + $om->deleteMeeting($_GET['id']); + unset($om); + $message = Display::return_message(get_lang('MeetingDeleted').'
'.get_lang('MeetingDeletedComment'), 'success', false); + header('Location: '.api_get_self()); + exit; + break; + case 'end': + $om->endMeeting($_GET['id']); + $message = Display::return_message(get_lang('MeetingClosed').'
'.get_lang('MeetingClosedComment'), 'success', false); + break; + case 'publish': + // Not implemented yet + //$result = $om->publish_meeting($_GET['id']); + break; + case 'unpublish': + // Not implemented yet + //$result = $om->unpublish_meeting($_GET['id']); + break; + default: + break; + } +} + +$meetings = $om->getCourseMeetings(); +$openMeeting = false; +$users_online = 0; + +if (!empty($meetings)) { + $meetings = array_reverse($meetings); + foreach ($meetings as $meeting) { + if ($meeting['status'] == 1) { + $openMeeting = true; + } + } + $users_online = $meetings->participantCount; +} + +$status = $om->isServerRunning(); +$show_join_button = false; +if ($openMeeting || $teacher) { + $show_join_button = true; +} + +$tpl->assign('allow_to_edit', $teacher); +$tpl->assign('meetings', $meetings); +$conference_url = api_get_path(WEB_PLUGIN_PATH).'openmeetings/start.php?launch=1&'.api_get_cidreq(); +$tpl->assign('conference_url', $conference_url); +$tpl->assign('users_online', $users_online); +$tpl->assign('openmeetings_status', $status); +$tpl->assign('show_join_button', $show_join_button); +$tpl->assign('message', $message); +$listing_tpl = 'openmeetings/listing.tpl'; +$content = $tpl->fetch($listing_tpl); +$tpl->assign('content', $content); +$tpl->display_one_col_template(); diff --git a/plugin/openmeetings/listing.tpl b/plugin/openmeetings/listing.tpl new file mode 100644 index 0000000000..4ffbafe0bd --- /dev/null +++ b/plugin/openmeetings/listing.tpl @@ -0,0 +1,66 @@ +';
foreach ($courses as $key => $course)
@@ -262,13 +262,13 @@ EOT;
}
/**
- * Displays the subscribe icon if subscribing is allowed and
+ * Displays the subscribe icon if subscribing is allowed and
* if the user is not yet subscribed to this course
- *
+ *
* @global type $stok
* @param array $current_course
* @param array $user_courses
- * @return bool
+ * @return bool
*/
function display_subscribe_icon($current_course, $user_courses)
{
@@ -289,7 +289,7 @@ EOT;
return false;
}
- //Subscribe form
+ //Subscribe form
$self = $_SERVER['PHP_SELF'];
echo <<
".$plugin_info['settings']['hello_world_show_type']."
"; } else { - echo "Hello world
"; + echo "Hello world
"; } //Using get_lang inside a plugin diff --git a/plugin/hello_world/plugin.php b/plugin/hello_world/plugin.php index cb7851b019..57bd19f160 100644 --- a/plugin/hello_world/plugin.php +++ b/plugin/hello_world/plugin.php @@ -1,6 +1,7 @@ Plugins) * @package chamilo.plugin * @author Julio Montoya'; + +$strings['openmeetings_welcome_message'] = 'Welcome message'; +$strings['openmeetings_record_and_store'] = 'Record and store sessions'; + +$strings['plugin_tool_openmeetings'] = 'Video'; + +$strings['ThereAreNotRecordingsForTheMeetings'] = 'There are not recording for the meeting sessions'; +$strings['NoRecording'] = 'No recording'; + diff --git a/plugin/openmeetings/lang/french.php b/plugin/openmeetings/lang/french.php new file mode 100644 index 0000000000..21f8fd140d --- /dev/null +++ b/plugin/openmeetings/lang/french.php @@ -0,0 +1,50 @@ +en installer un avant de poursuivre, ou demander un devis à l'un des fournisseurs officiels de Chamilo. OpenMeetings est un outil de logiciel libre (et gratuit), mais son installation pourrait présenter une certaine complexité et demander des compétences qui ne sont peut-être pas à la portée de tous. Vous pouvez l'installer vous-même à partir de la documentation (disponible publiquement) de OpenMeetings, ou recherchez un soutien professionnel. Ce soutien pourrait générer certains coûts (au moins le temps de la personne qui vous assiste dans l'opération). Dans le plus pur esprit du logiciel libre, nous vous fournissons les outils pour simplifier votre travail dans la mesure de nos possibilités, et nous vous recommandons des professionnels (les fournisseurs officiels de Chamilo) pour vous venir en aide au cas où ceux-ci seraient insuffisants.
"; + +$strings['openmeetings_welcome_message'] = 'Message de bienvenue de OpenMeetings'; +$strings['openmeetings_record_and_store'] = 'Enregistrer les sessions de vidéoconférence'; + +$strings['plugin_tool_openmeetings'] = 'Vidéo'; + +$strings['ThereAreNotRecordingsForTheMeetings'] = 'Aucun enregistrement disponible'; +$strings['NoRecording'] = "Pas d'enregistrement"; + diff --git a/plugin/openmeetings/lang/spanish.php b/plugin/openmeetings/lang/spanish.php new file mode 100644 index 0000000000..4195abb3d5 --- /dev/null +++ b/plugin/openmeetings/lang/spanish.php @@ -0,0 +1,53 @@ +configure uno antes de seguir, o pida una cotización a uno de los proveedores oficiales de Chamilo. OpenMeetings es una herramienta de software libre (y gratuita), pero su instalación requiere de competencias que quizás no sean inmediatamente disponibles para todos. Puede instalarla usted mismo o buscar ayuda profesional. Esta ayuda podrÃa no obstante generar algunos costos (por lo menos el tiempo de la persona quien lo ayude). En el puro espÃritu del software libre, le ofrecemos las herramientas para hacer su trabajo más simple, en la medida de nuestras posibilidades, y le recomendamos profesionales (los proveedores oficiales de Chamilo) para ayudarlo en caso esto fuera demasiado complicado.
'; + +$strings['openmeetings_welcome_message'] = 'Mensaje de bienvenida de '; +$strings['openmeetings_record_and_store'] = 'Grabar las sesiones de videoconferencia'; + +$strings['plugin_tool_openmeetings'] = 'Video'; + +$strings['ThereAreNotRecordingsForTheMeetings'] = 'No hay grabaciones de sesiones de videoconferencia'; +$strings['NoRecording'] = 'No hay grabación'; + diff --git a/plugin/openmeetings/lib/openmeetings.class.php b/plugin/openmeetings/lib/openmeetings.class.php new file mode 100644 index 0000000000..3d1e24e7ca --- /dev/null +++ b/plugin/openmeetings/lib/openmeetings.class.php @@ -0,0 +1,631 @@ +get('tool_enable'); + $om_host = $plugin->get('host'); + $om_user = $plugin->get('user'); + $om_pass = $plugin->get('pass'); + $accessUrl = api_get_access_url($_configuration['access_url']); + $this->externalType = substr($accessUrl['url'], strpos($accessUrl['url'], '://')+3, -1); + if (strcmp($this->externalType, 'localhost') == 0) { + $this->externalType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH), '://')+3, -1); + } + $this->externalType = 'chamilolms.'.$this->externalType; + $this->table = \Database::get_main_table('plugin_openmeetings'); + + if ($om_plugin) { + $user_info = api_get_user_info(); + $this->user_complete_name = $user_info['complete_name']; + $this->user = $om_user; + $this->pass = $om_pass; + $this->url = $om_host; + + // Setting OM api + define('CONFIG_OPENMEETINGS_USER', $this->user); + define('CONFIG_OPENMEETINGS_PASS', $this->pass); + define('CONFIG_OPENMEETINGS_SERVER_URL', $this->url); + + $this->gateway = new \OpenMeetingsGateway($this->url, $this->user, $this->pass); + $this->plugin_enabled = $om_plugin; + // The room has a name composed of C + course ID + '-' + session ID + $this->chamiloCourseId = api_get_course_int_id(); + $this->chamiloSessionId = api_get_session_id(); + $this->roomName = 'C'.$this->chamiloCourseId.'-'.$this->chamiloSessionId; + $return = $this->gateway->loginUser(); + if ($return == 0) { + $msg = 'Could not initiate session with server through OpenMeetingsGateway::loginUser()'; + error_log(__FILE__.'+'.__LINE__.': '.$msg); + die($msg); + } + $this->sessionId = $this->gateway->sessionId; + } + } + + /** + * Checks whether a user is teacher in the current course + * @return bool True if the user can be considered a teacher in this course, false otherwise + */ + public function isTeacher() + { + return api_is_course_admin() || api_is_coach() || api_is_platform_admin(); + } + + /** + * Login the user with OM Server. This generates a session ID that is + * specific to the current user, but that does not require specific user data + * + * It is similar to opening a PHP session. In fact, the session ID is kept + * inside the $_SESSION['openmeetings_session'] session variable + * @return bool True if the user is correct and false when is incorrect + * @deprecated loginUser now called at object instanciation + */ + /** + function loginUser() + { + try { + //Verifying if there is already an active session + if (empty($_SESSION['openmeetings_session'])) { + // Login user returns either 0 or >0, depending on the results + // Technically, as long as the SOAP user has been configured in OpenMeetings and OpenMeetings is on, this should always succeed. + if ($this->gateway->loginUser()) { + $this->sessionId = $_SESSION['openmeetings_session'] = $this->gateway->session_id; + return true; + } else { + error_log('loginUser did not succeed'); + return false; + } + } else { + $this->sessionId = $_SESSION['openmeetings_session']; + return true; + } + } catch (SoapFault $e) { + error_log(__FILE__.'+'.__LINE__.' Warning: We have detected some problems. Fault: '.$e->faultstring); + return false; + } + } + */ + + /* + * Creating a Room for the meeting + * @return bool True if the user is correct and false when is incorrect + */ + public function createMeeting($params) + { + global $_configuration; + // First, try to see if there is an active room for this course and session. + $roomId = null; + + $meetingData = \Database::select( + '*', + $this->table, + array( + 'where' => + array( + 'c_id = ?' => $this->chamiloCourseId, + ' AND session_id = ? ' => $this->chamiloSessionId, + ' AND status <> ? ' => 2, + + ) + ), + 'first' + ); + + if ($meetingData != false && count($meetingData) > 0) { + //error_log(print_r($meetingData,1)); + //error_log('Found previous room reference - reusing'); + // There has been a room in the past for this course. It should + // still be on the server, so update (instead of creating a new one) + // This fills the following attributes: status, name, comment, chamiloCourseId, chamiloSessionId + $room = new Room(); + $room->loadRoomId($meetingData['room_id']); + $roomArray = (array)$room; + $roomArray['SID'] = $this->sessionId; + $roomId = $this->gateway->updateRoomWithModeration($room); + if ($roomId != $meetingData['room_id']) { + $msg = 'Something went wrong: the updated room ID ('.$roomId.') is not the same as the one we had ('.$meetingData['room_id'].')'; + error_log($msg); + die($msg); + } + + } else { + //error_log('Found no previous room - creating'); + $room = new Room(); + $room->SID = $this->sessionId; + $room->name = $this->roomName; + //$room->roomtypes_id = $room->roomtypes_id; + $room->comment = urlencode(get_lang('Course').': ' . $params['meeting_name'] . ' - '.$_configuration['software_name']); + //$room->numberOfPartizipants = $room->numberOfPartizipants; + $room->ispublic = $room->getString('isPublic', 'false'); + //$room->appointment = $room->getString('appointment'); + //$room->isDemoRoom = $room->getString('isDemoRoom'); + //$room->demoTime = $room->demoTime; + //$room->isModeratedRoom = $room->getString('isModeratedRoom'); + $roomId = $this->gateway->createRoomWithModAndType($room); + } + + if (!empty($roomId)) { + /* + // Find the biggest room_id so far, and create a new one + if (empty($roomId)) { + $roomData = \Database::select('MAX(room_id) as room_id', $this->table, array(), 'first'); + $roomId = $roomData['room_id'] + 1; + }*/ + + $params['status'] = '1'; + $params['meeting_name'] = $room->name; + $params['created_at'] = api_get_utc_datetime(); + $params['room_id'] = $roomId; + $params['c_id'] = api_get_course_int_id(); + $params['session_id'] = api_get_session_id(); + $params['record'] = ($room->allowRecording?1:0); + + $id = \Database::insert($this->table, $params); + + $this->joinMeeting($id); + } else { + return -1; + } + } + + /** + * Returns a meeting "join" URL + * @param string The name of the meeting (usually the course code) + * @return mixed The URL to join the meeting, or false on error + * @todo implement moderator pass + * @assert ('') === false + * @assert ('abcdefghijklmnopqrstuvwxyzabcdefghijklmno') === false + */ + public function joinMeeting($meetingId) + { + if (empty($meetingId)) { + return false; + } + $meetingData = \Database::select( + '*', + $this->table, + array('where' => array('id = ? AND status = 1 ' => $meetingId)), + 'first' + ); + + if (empty($meetingData)) { + if ($this->debug) { + error_log("meeting does not exist: $meetingId "); + } + return false; + } + $params = array('room_id' => $meetingData['room_id']); + $returnVal = $this->setUserObjectAndGenerateRoomHashByURLAndRecFlag($params); + $iframe = $this->url . "/?" ."secureHash=" . $returnVal; + printf("", $iframe, "100%", 640); + } + + /** + * Checks if the videoconference server is running. + * Function currently disabled (always returns 1) + * @return bool True if server is running, false otherwise + * @assert () === false + */ + public function isServerRunning() + { + // Always return true for now as this requires the openmeetings object + // to have been instanciated and this includes a loginUser() which + // connects to the server + return true; + } + + /** + * Gets the password for a specific meeting for the current user + * @return string A moderator password if user is teacher, or the course code otherwise + */ + public function getMeetingUserPassword() + { + if ($this->isTeacher()) { + return $this->getMeetingModerationPassword(); + } else { + return api_get_course_id(); + } + } + + /** + * Generated a moderator password for the meeting + * @return string A password for the moderation of the video conference + */ + public function getMeetingModerationPassword() + { + return api_get_course_id().'mod'; + } + + /** + * Get information about the given meeting + * @param array ...? + * @return mixed Array of information on success, false on error + * @assert (array()) === false + */ + public function getMeetingInfo($params) + { + try { + $result = $this->api->getMeetingInfoArray($params); + if ($result == null) { + if ($this->debug) { + error_log(__FILE__.'+'.__LINE__." Failed to get any response. Maybe we can't contact the OpenMeetings server."); + } + } else { + return $result; + } + } catch (Exception $e) { + if ($this->debug) { + error_log(__FILE__.'+'.__LINE__.' Caught exception: ', $e->getMessage(), "\n"); + } + } + return false; + } + + /** + * @param array $params Array of parameters + * @return mixed + */ + public function setUserObjectAndGenerateRecordingHashByURL($params) + { + $username = $_SESSION['_user']['username']; + $firstname = $_SESSION['_user']['firstname']; + $lastname = $_SESSION['_user']['lastname']; + $userId = $_SESSION['_user']['user_id']; + $systemType = 'chamilo'; + $room_id = $params['room_id']; + + $urlWsdl = $this->url."/services/UserService?wsdl"; + $omServices = new \SoapClient($urlWsdl); + $objRec = new User(); + + $objRec->SID = $this->sessionId; + $objRec->username = $username; + $objRec->firstname = $firstname; + $objRec->lastname = $lastname; + $objRec->externalUserId = $userId; + $objRec->externalUserType = $systemType; + $objRec->recording_id = $recording_id; + $orFn = $omServices->setUserObjectAndGenerateRecordingHashByURL($objRec); + + return $orFn->return; + } + + /** + * @param Array $params Array of parameters + * @return mixed + */ + public function setUserObjectAndGenerateRoomHashByURLAndRecFlag($params) + { + $username = $_SESSION['_user']['username']; + $firstname = $_SESSION['_user']['firstname']; + $lastname = $_SESSION['_user']['lastname']; + $profilePictureUrl = $_SESSION['_user']['avatar']; + $email = $_SESSION['_user']['mail']; + $userId = $_SESSION['_user']['user_id']; + $systemType = 'Chamilo'; + $room_id = $params['room_id']; + $becomeModerator = ( $this->isTeacher() ? 1 : 0 ); + $allowRecording = 1; //Provisional + + $urlWsdl = $this->url."/services/UserService?wsdl"; + $omServices = new \SoapClient($urlWsdl); + $objRec = new User(); + + $objRec->SID = $this->sessionId; + $objRec->username = $username; + $objRec->firstname = $firstname; + $objRec->lastname = $lastname; + $objRec->profilePictureUrl = $profilePictureUrl; + $objRec->email = $email; + $objRec->externalUserId = $userId; + $objRec->externalUserType = $systemType; + $objRec->room_id = $room_id; + $objRec->becomeModeratorAsInt = $becomeModerator; + $objRec->showAudioVideoTestAsInt = 1; + $objRec->allowRecording = $allowRecording; + $rcFn = $omServices->setUserObjectAndGenerateRoomHashByURLAndRecFlag($objRec); + + return $rcFn->return; + } + + /** + * Gets all the course meetings saved in the plugin_openmeetings table + * @return array Array of current open meeting rooms + */ + public function getCourseMeetings() + { + $newMeetingsList = array(); + $item = array(); + $meetingsList = \Database::select( + '*', + $this->table, + array('where' => + array( + 'c_id = ? ' => api_get_course_int_id(), + ' AND session_id = ? ' => api_get_session_id(), + ' AND status <> ? ' => 2 // status deleted + ) + ) + ); + /*$urlWsdl = $this->url."/services/RoomService?wsdl"; + $omServices = new \SoapClient($urlWsdl);*/ + $room = new Room(); + + /* + try { + $rooms = $this->gateway->getRoomsWithCurrentUsersByType(); + //$rooms = $omServices->getRoomsPublic(array( + //'SID' => $this->sessionId, + //'start' => 0, + //'max' => 10, + //'orderby' => 'name', + //'asc' => 'true', + //'externalRoomType' => 'chamilo', + //'roomtypes_id' => 'chamilo', + //) + //); + } catch (SoapFault $e) { + error_log(__FILE__.'+'.__LINE__.' '.$e->faultstring); + //error_log($rooms->getDebug()); + return false; + } + */ + $room->SID = $this->sessionId; + //error_log(__FILE__.'+'.__LINE__.' Meetings found: '.print_r($room->SID,1)); + if (!empty($meetingsList)) { + foreach ($meetingsList as $meetingDb) { + //$room->rooms_id = $meetingDb['room_id']; + error_log(__FILE__.'+'.__LINE__.' Meetings found: '.print_r($meetingDb, 1)); + $remoteMeeting = array(); + $meetingDb['created_at'] = api_get_local_time($meetingDb['created_at']); + $meetingDb['closed_at'] = (!empty($meetingDb['closed_at']) ? api_get_local_time($meetingDb['closed_at']):''); + // Fixed value for now + $meetingDb['participantCount'] = 40; + $rec = $this->gateway->getFlvRecordingByRoomId($meetingDb['room_id']); + $links = array(); + // Links to videos look like these: + // http://video2.openmeetings.com:5080/openmeetings/DownloadHandler?fileName=flvRecording_4.avi&moduleName=lzRecorderApp&parentPath=&room_id=&sid=dfc0cac396d384f59242aa66e5a9bbdd + $link = $this->url.'/DownloadHandler?fileName=%s&moduleName=lzRecorderApp&parentPath=&room_id=%s&sid=%s'; + if (!empty($rec)) { + $link1 = sprintf($link, $rec['fileHash'], $meetingDb['room_id'], $this->sessionId); + $link2 = sprintf($link, $rec['alternateDownload'], $meetingDb['room_id'], $this->sessionId); + $links[] = $rec['fileName'].' '. + \Display::url('[.flv]', $link1, array('target' => '_blank')).' '. + \Display::url('[.avi]', $link2, array('target' => '_blank')); + + } + $item['show_links'] = implode('
', $links); + + // The following code is currently commented because the web service + // says this is not allowed by the SOAP user. + /* + try { + // Get the conference room object from OpenMeetings server - requires SID and rooms_id to be defined + $objRoomId = $this->gateway->getRoomById($meetingDb['room_id']); + if (empty($objRoomId->return)) { + error_log(__FILE__.'+'.__LINE__.' Emptyyyyy '); + //\Database::delete($this->table, "id = {$meetingDb['id']}"); + // Don't delete expired rooms, just mark as closed + \Database::update($this->table, array('status' => 0, 'closed_at' => api_get_utc_datetime()), array('id = ? ' => $meetingDb['id'])); + continue; + } + //$objCurUs = $omServices->getRoomWithCurrentUsersById($objCurrentUsers); + } catch (SoapFault $e) { + error_log(__FILE__.'+'.__LINE__.' '.$e->faultstring); + exit; + } + //if( empty($objCurUs->returnMeetingID) ) continue; + + $current_room = array( + 'roomtype' => $objRoomId->return->roomtype->roomtypes_id, + 'meetingName' => $objRoomId->return->name, + 'meetingId' => $objRoomId->return->meetingID, + 'createTime' => $objRoomId->return->rooms_id, + 'showMicrophoneStatus' => $objRoomId->return->showMicrophoneStatus, + 'attendeePw' => $objRoomId->return->attendeePW, + 'moderatorPw' => $objRoomId->return->moderators, + 'isClosed' => $objRoomId->return->isClosed, + 'allowRecording' => $objRoomId->return->allowRecording, + 'startTime' => $objRoomId->return->startTime, + 'endTime' => $objRoomId->return->updatetime, + 'participantCount' => count($objRoomId->return->currentusers), + 'maxUsers' => $objRoomId->return->numberOfPartizipants, + 'moderatorCount' => count($objRoomId->return->moderators) + ); + // Then interate through attendee results and return them as part of the array: + if (!empty($objRoomId->return->currentusers)) { + foreach ($objRoomId->return->currentusers as $a) + $current_room[] = array( + 'userId' => $a->username, + 'fullName' => $a->firstname . " " . $a->lastname, + 'isMod' => $a->isMod + ); + } + $remoteMeeting = $current_room; + */ + + if (empty( $remoteMeeting )) { + /* + error_log(__FILE__.'+'.__LINE__.' Empty remote Meeting for now'); + if ($meetingDb['status'] == 1 && $this->isTeacher()) { + $this->endMeeting($meetingDb['id']); + } + */ + } else { + $remoteMeeting['add_to_calendar_url'] = api_get_self().'?action=add_to_calendar&id='.$meetingDb['id'].'&start='.api_strtotime($meetingDb['startTime']); + } + $remoteMeeting['end_url'] = api_get_self().'?action=end&id='.$meetingDb['id']; + $remoteMeeting['delete_url'] = api_get_self().'?action=delete&id='.$meetingDb['id']; + + //$record_array = array(); + + // if ($meetingDb['record'] == 1) { + // $recordingParams = array( + // 'meetingId' => $meetingDb['id'], //-- OPTIONAL - comma separate if multiple ids + // ); + // + // $records = $this->api->getRecordingsWithXmlResponseArray($recordingParams); + // if (!empty($records)) { + // $count = 1; + // if (isset($records['message']) && !empty($records['message'])) { + // if ($records['messageKey'] == 'noRecordings') { + // $record_array[] = get_lang('NoRecording'); + // } else { + // //$record_array[] = $records['message']; + // } + // } else { + // foreach ($records as $record) { + // if (is_array($record) && isset($record['recordId'])) { + // $url = Display::url(get_lang('ViewRecord'), $record['playbackFormatUrl'], array('target' => '_blank')); + // if ($this->is_teacher()) { + // $url .= Display::url(Display::return_icon('link.gif',get_lang('CopyToLinkTool')), api_get_self().'?action=copy_record_to_link_tool&id='.$meetingDb['id'].'&record_id='.$record['recordId']); + // $url .= Display::url(Display::return_icon('agenda.png',get_lang('AddToCalendar')), api_get_self().'?action=add_to_calendar&id='.$meetingDb['id'].'&start='.api_strtotime($meetingDb['created_at']).'&url='.$record['playbackFormatUrl']); + // $url .= Display::url(Display::return_icon('delete.png',get_lang('Delete')), api_get_self().'?action=delete_record&id='.$record['recordId']); + // } + // //$url .= api_get_self().'?action=publish&id='.$record['recordID']; + // $count++; + // $record_array[] = $url; + // } else { + // + // } + // } + // } + // } + // //var_dump($record_array); + // $item['show_links'] = implode('
', $record_array); + // + // } + // + //$item['created_at'] = api_convert_and_format_date($meetingDb['created_at']); + // //created_at + // + // $item['publish_url'] = api_get_self().'?action=publish&id='.$meetingDb['id']; + // $item['unpublish_url'] = api_get_self().'?action=unpublish&id='.$meetingDb['id']; + // + //if ($meetingDb['status'] == 1) { + // $joinParams = array( + // 'meetingId' => $meetingDb['id'], //-- REQUIRED - A unique id for the meeting + // 'username' => $this->user_complete_name, //-- REQUIRED - The name that will display for the user in the meeting + // 'password' => $pass, //-- REQUIRED - The attendee or moderator password, depending on what's passed here + // 'createTime' => '', //-- OPTIONAL - string. Leave blank ('') unless you set this correctly. + // 'userID' => '', // -- OPTIONAL - string + // 'webVoiceConf' => '' // -- OPTIONAL - string + // ); + // $returnVal = $this->setUserObjectAndGenerateRoomHashByURLAndRecFlag( array('room_id' => $meetingDb['id']) ); + // $joinUrl = CONFIG_OPENMEETINGS_SERVER_URL . "?" . + // "secureHash=" . $returnVal; + // + // $item['go_url'] = $joinUrl; + //} + $item = array_merge($item, $meetingDb, $remoteMeeting); + //error_log(__FILE__.'+'.__LINE__.' Item: '.print_r($item,1)); + $newMeetingsList[] = $item; + } //end foreach $meetingsList + } + + return $newMeetingsList; + } + + /** + * Send a command to the OpenMeetings server to close the meeting + * @param int $meetingId + * @return int + */ + public function endMeeting($meetingId) + { + try { + $room = new Room($meetingId); + $room->SID = $this->sessionId; + $room->room_id = intval($meetingId); + $room->status = false; + + $urlWsdl = $this->url."/services/RoomService?wsdl"; + $ws = new \SoapClient($urlWsdl); + + $roomClosed = $ws->closeRoom($room); + if ($roomClosed > 0) { + \Database::update( + $this->table, + array( + 'status' => 0, + 'closed_at' => api_get_utc_datetime() + ), + array('id = ? ' => $meetingId) + ); + } + //error_log(__FILE__.'+'.__LINE__.' Finished closing'); + } catch (SoapFault $e) { + error_log(__FILE__.'+'.__LINE__.' Warning: We have detected some problems: Fault: '.$e->faultstring); + exit; + return -1; + } + } + + /** + * @param int $id + * @return int + */ + public function deleteMeeting($id) + { + try { + $room = new Room(); + $room->loadRoomId($id); + $this->gateway->deleteRoom($room); + \Database::update( + $this->table, + array( + 'status' => 2 + ), + array('id = ? ' => $id) + ); + return $id; + //error_log(__FILE__.'+'.__LINE__.' Finished closing'); + } catch (SoapFault $e) { + error_log(__FILE__.'+'.__LINE__.' Warning: We have detected some problems: Fault: '.$e->faultstring); + exit; + return -1; + } + } +} diff --git a/plugin/openmeetings/lib/openmeetings_api.php b/plugin/openmeetings/lib/openmeetings_api.php new file mode 100644 index 0000000000..af4551eb9e --- /dev/null +++ b/plugin/openmeetings/lib/openmeetings_api.php @@ -0,0 +1,24 @@ +_user = CONFIG_OPENMEETINGS_USER; + $this->_pass = CONFIG_OPENMEETINGS_PASS; + $this->_serverBaseUrl = CONFIG_OPENMEETINGS_SERVER_URL; + } +} diff --git a/plugin/openmeetings/lib/openmeetings_gateway.php b/plugin/openmeetings/lib/openmeetings_gateway.php new file mode 100644 index 0000000000..8f8af447f7 --- /dev/null +++ b/plugin/openmeetings/lib/openmeetings_gateway.php @@ -0,0 +1,474 @@ +_user = urlencode($user); + $this->_pass = urlencode($pass); + $this->_url = $host; + if (substr($this->_url, -1, 1) == '/') { + $this->_url = substr($this->_url, 0, -1); + } + $this->rest = new OpenMeetingsRestService(); + $err = $this->rest->getError(); + if ($err) { + error_log('Constructor error: ' . $err); + error_log('Debug: ' . $this->rest->getDebug());; + exit(); + } + } + + /** + * @param string $name + * @return string + */ + public function getRestUrl($name) + { + return $this->getUrl() . "/services/" . $name . "/"; + } + + /** + * @return string + */ + public function getUrl() + { + return $this->_url; + } + + /** + * @param bool $in + * @return string + */ + public function var_to_str($in) + { + if (is_bool($in)) { + return $in ? "true" : "false"; + } else { + return $in; + } + } + + /** + * TODO: Get Error Service and show detailed Error Message + */ + public function loginUser() + { + $returnValue = 0; + $response = $this->rest->call($this->getRestUrl("UserService") . "getSession", "session_id"); + + if ($this->rest->getError()) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($response, 1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error: ' . $err); + } else { + //error_log('getSession returned '.$response. ' - Storing as sessionId'); + $this->sessionId = $response; + + $url = $this->getRestUrl("UserService") + . "loginUser?" + . "SID=" . $this->sessionId + . "&username=" . $this->_user + . "&userpass=" . $this->_pass; + $result = $this->rest->call($url); + if ($this->rest->getError()) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($result, 1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error '. $err); + } else { + $returnValue = $result; + } + } + } + } + + if ($returnValue > 0) { + return true; + } else { + return false; + } + } + + /** + * @param Room $room + * @return array|bool|int|null + */ + public function updateRoomWithModeration($room) + { + $err = $this->rest->getError(); + if ($err) { + error_log('Constructor error: ' . $err); + error_log('Debug: ' . $this->rest->getDebug()); + exit(); + } + + $isModeratedRoom = false; + if ($room->isModeratedRoom == 1) { + $isModeratedRoom = true; + } + + $url = $this->getRestUrl($this->getRestUrl("RoomService") + . "updateRoomWithModeration?SID=" . $this->sessionId + . "&room_id=" . $room->room_id + . "&name=" . urlencode($room->name) + . "&roomtypes_id=" . $room->roomtypes_id + . "&comment=" . $room->comment + . "&numberOfPartizipants=" . $room->numberOfPartizipants + . "&ispublic=false" + . "&appointment=false" + . "&isDemoRoom=false" + . "&demoTime=0" + . "&isModeratedRoom=" . $this->var_to_str($isModeratedRoom)); + //error_log($url); + $result = $this->rest->call($url); + + if ($result->fault) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($result, 1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error: ' . $err); + } else { + // echo '
Result
'; print_r($result["return"]); echo ''; + //error_log('Room updated successfully '.print_r($result,1)); + return $result; + } + } + return - 1; + } + + /** + * @param $username + * @param $firstname + * @param $lastname + * @param $userId + * @param $systemType + * @param $recording_id + * @return array|bool|int|null + */ + public function setUserObjectAndGenerateRecordingHashByURL($username, $firstname, $lastname, $userId, $systemType, $recording_id) + { + $result = $this->rest->call($this->getRestUrl("UserService") + . 'setUserObjectAndGenerateRecordingHashByURL?' + . 'SID=' . $this->sessionId + . '&username=' . urlencode($username) + . '&firstname=' . urlencode($firstname) + . '&lastname=' . urlencode($lastname) + . '&externalUserId=' . $userId + . '&externalUserType=' . urlencode($systemType) + . '&recording_id=' . $recording_id, 'return'); + + if ($result->fault) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($result, 1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error: '.$err); + } else { + return $result; + } + } + return - 1; + } + + /** + * @param $username + * @param $firstname + * @param $lastname + * @param $profilePictureUrl + * @param $email + * @param $userId + * @param $systemType + * @param $room_id + * @param $becomeModerator + * @param $allowRecording + * @return array|bool|int|null + */ + public function setUserObjectAndGenerateRoomHashByURLAndRecFlag($username, $firstname, $lastname, $profilePictureUrl, $email, $userId, $systemType, $room_id, $becomeModerator, $allowRecording) + { + $err = $this->rest->getError(); + if ($err) { + error_log('Constructor error: ' . $err); + error_log('Debug: ' . $this->rest->getDebug());; + exit(); + } + + $result = $this->rest->call($this->getRestUrl("UserService") + . "setUserObjectAndGenerateRoomHashByURLAndRecFlag?" + . "SID=" . $this->sessionId + . "&username=" . urlencode($username) + . "&firstname=" . urlencode($firstname) + . "&lastname=" . urlencode($lastname) + . "&profilePictureUrl=" . urlencode($profilePictureUrl) + . "&email=" . urlencode($email) + . "&externalUserId=" . urlencode($userId) + . "&externalUserType=" . urlencode($systemType) + . "&room_id=" . urlencode($room_id) + . "&becomeModeratorAsInt=" . $becomeModerator + . "&showAudioVideoTestAsInt=1" + . "&allowRecording=" . $this->var_to_str($allowRecording)); + + if ($result->fault) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($result,1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error: '.$err); + } else { + // echo '
Result
'; print_r($result["return"]); echo ''; + return $result; + } + } + return - 1; + } + + /** + * @param Room $openmeetings + * @return array|bool|int|null + */ + public function deleteRoom($openmeetings) + { + $err = $this->rest->getError(); + if ($err) { + error_log('Constructor error: ' . $err); + error_log('Debug: ' . $this->rest->getDebug()); + exit(); + } + $url = $this->getRestUrl("RoomService")."deleteRoom?SID=".$this->sessionId."&rooms_id=".$openmeetings->room_id; + $result = $this->rest->call($url); + + if ($result->fault) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($result,1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error: '.$err); + } else { + // echo '
Result
'; print_r($result["return"]); echo ''; + // return $result["return"]; + return $result; + } + } + return - 1; + } + + /** + * Generate a new room hash for entering a conference room + */ + public function setUserObjectAndGenerateRoomHash($username, $firstname, $lastname, $profilePictureUrl, $email, $externalUserId, $externalUserType, $room_id, $becomeModeratorAsInt, $showAudioVideoTestAsInt) + { + $result = $this->rest->call($this->getRestUrl("UserService") + . "setUserObjectAndGenerateRoomHash?" + . "SID=" . $this->sessionId + . "&username=" . urlencode($username) + . "&firstname=" . urlencode($firstname) + . "&lastname=" . urlencode($lastname) + . "&profilePictureUrl=" . urlencode($profilePictureUrl) + . "&email=" . urlencode($email) + . "&externalUserId=" . urlencode($externalUserId) + . "&externalUserType=" . urlencode($externalUserType) + . "&room_id=" . $room_id + . "&becomeModeratorAsInt=" . $becomeModeratorAsInt + . "&showAudioVideoTestAsInt=" . $showAudioVideoTestAsInt); + + if ($result->getError()) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($result,1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error: '.$err); + } else { + // echo '
Result
'; print_r($result["return"]); echo ''; + return $result; + } + } + return - 1; + } + + /** + * Create a new conference room + * @param Room The room object + * @return The REST call's result + */ + public function createRoomWithModAndType($room) + { + $service = 'addRoomWithModerationAndExternalType'; + if ($room->allowRecording) { + $service = 'addRoomWithModerationAndRecordingFlags'; + } elseif ($room->isAudioOnly) { + $service = 'addRoomWithModerationExternalTypeAndAudioType'; + } + $url = $this->getRestUrl("RoomService") + . $service.'?' + . 'SID=' . $room->SID + . '&name=' . $room->name + . '&roomtypes_id=' . $room->roomtypes_id + . '&comment='. $room->comment + . '&numberOfPartizipants=' . $room->numberOfPartizipants + . '&ispublic=' . $this->var_to_str($room->ispublic) + . '&appointment=' . $this->var_to_str($room->appointment) + . '&isDemoRoom=' . $this->var_to_str($room->isDemoRoom) + . '&demoTime=' . $room->demoTime + . '&isModeratedRoom=' . $this->var_to_str($room->isModeratedRoom) + . '&externalRoomType=' . $room->externalRoomType; + if ($room->allowRecording) { + $url .= '&allowUserQuestions=' . $this->var_to_str($room->allowUserQuestions) + . '&isAudioOnly=' . $this->var_to_str($room->isAudioOnly) + . '&waitForRecording=' . $this->var_to_str($room->waitForRecording) + . '&allowRecording=' . $this->var_to_str($room->allowRecording); + } elseif ($room->isAudioOnly) { + $url .= '&isAudioOnly=' . $this->var_to_str($room->isAudioOnly); + } + $result = $this->rest->call($url); + + if ($this->rest->fault) { + error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($result,1)); + } else { + $err = $this->rest->getError(); + if ($err) { + error_log('Error: '.$err); + } else { + //error_log('Creation of a new room succeeded: ID '.print_r($result,1)); + return $result; + } + } + return -1; + } + + /** + * Gets the list of open rooms of type "Chamilo" + * @param string $type The type of external system connecting to OpenMeetings + * @return bool + */ + public function getRoomsWithCurrentUsersByType($type = 'chamilolms') + { + //$this->loginUser(); + if (empty($this->sessionId)) { + return false; + } + + $url = $this->getRestUrl("RoomService") . "getRoomsWithCurrentUsersByListAndType?SID=" . $this->sessionId + . "&start=1&max=1000&orderby=name&asc=true&externalRoomType=chamilolms"; + //$url = $this->getRestUrl("RoomService") + // . "getRoomTypes?" + // . "SID=" . $this->sessionId; + //$url = $this->getRestUrl('JabberService') . 'getAvailableRooms?SID=' . $this->sessionId; + //error_log(__FILE__.'+'.__LINE__.' Calling WS: '.$url); + $result = $this->rest->call($url, "return"); + $rooms = array(); + foreach ($result as $room) { + //error_log(__FILE__.'+'.__LINE__.': one room found on remote: '.print_r($room,1)); + if ($room['externalRoomType'] == $type && count($room['currentusers']) > 0 ) { + $rooms[] = $room; + } + } + return $result; + } + + /** + * Gets details of a remote room by room ID + * @param int $roomId The ID of the room, as of plugin_openmeetings.room_id + * @return mixed Room object + */ + public function getRoomById($roomId = 0) + { + //$this->loginUser(); + if (empty($this->sessionId) or empty($roomId)) { + return false; + } + $roomId = intval($roomId); + + $url = $this->getRestUrl("RoomService") + . "getRoomById?" + . "SID=" . $this->sessionId + . "&rooms_id=".$roomId; + //error_log(__FILE__.'+'.__LINE__.' Calling WS: '.$url); + $result = $this->rest->call($url, "return"); + return $result; + } + + /** + * Get list of available recordings made by this instance + */ + public function getRecordingsByExternalRooms() + { + $url = $this->getRestUrl("RoomService") + . "getFlvRecordingByExternalRoomType?" + . "SID=" . $this->sessionId + . "&externalRoomType=" . urlencode($this->config["moduleKey"]); + + $result = $this->rest->call($url, "return"); + + return $result; + } + + /** + * Get the recording from the room + * @param int $id Room ID + * @return array + */ + public function getFlvRecordingByRoomId($id) + { + $url = $this->getRestUrl("RoomService") + . "getFlvRecordingByRoomId?" + . "SID=" . $this->sessionId + . "&roomId=" . urlencode($id); + + $result = $this->rest->call($url, "return"); + + return $result; + } + + /** + * Get list of available recordings made by user + */ + public function getRecordingsByExternalUser($id) + { + $url = $this->getRestUrl("RoomService") + . "getFlvRecordingByExternalUserId?" + . "SID=" . $this->sessionId + . "&externalUserId=" . $id; + + $result = $this->rest->call($url, "return"); + + return $result; + } +} diff --git a/plugin/openmeetings/lib/openmeetings_plugin.class.php b/plugin/openmeetings/lib/openmeetings_plugin.class.php new file mode 100644 index 0000000000..f8ff8b1056 --- /dev/null +++ b/plugin/openmeetings/lib/openmeetings_plugin.class.php @@ -0,0 +1,91 @@ + 'openmeetings_record_and_store', + 'type' => 'checkbox' + )); + + public static function create() + { + static $result = null; + return $result ? $result : $result = new self(); + } + + protected function __construct() + { + parent::__construct('2.0', 'Francis Gonzales', array('tool_enable' => 'boolean', 'host' =>'text', 'user' => 'text', 'pass' => 'text')); + } + + public function install() + { + $table = Database::get_main_table('plugin_openmeetings'); + // id is the internal unique ID (keeps track of historical sessions + // status is 0 for closed, 1 for open (available) + // room_id is a reference to the meeting ID on the OpenMeetings server. + // Any c_id + session_id occurence gets a unique new meeting ID to avoid issues with the number of rooms, as indicated in https://issues.apache.org/jira/browse/OPENMEETINGS-802#comment-13860340 + $sql = "CREATE TABLE IF NOT EXISTS $table ( + id INT unsigned NOT NULL auto_increment PRIMARY KEY, + c_id INT unsigned NOT NULL DEFAULT 0, + session_id INT unsigned NOT NULL DEFAULT 0, + room_id INT unsigned NOT NULL DEFAULT 0, + meeting_name VARCHAR(255) NOT NULL DEFAULT '', + attendee_pw VARCHAR(255) NOT NULL DEFAULT '', + moderator_pw VARCHAR(255) NOT NULL DEFAULT '', + record INT NOT NULL DEFAULT 0, + status INT NOT NULL DEFAULT 0, + created_at DATETIME NOT NULL, + closed_at DATETIME, + calendar_id INT DEFAULT 0, + welcome_msg TEXT NOT NULL DEFAULT '')"; + Database::query($sql); + + //Installing course settings + $this->install_course_fields_in_all_courses(); + } + + public function uninstall() + { + $t_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT); + $t_options = Database::get_main_table(TABLE_MAIN_SETTINGS_OPTIONS); + $t_tool = Database::get_course_table(TABLE_TOOL_LIST); + + //New settings + + $sql = "DELETE FROM $t_settings WHERE variable = 'openmeetings_tool_enable'"; + Database::query($sql); + $sql = "DELETE FROM $t_settings WHERE variable = 'openmeetings_pass'"; + Database::query($sql); + $sql = "DELETE FROM $t_settings WHERE variable = 'openmeetings_user'"; + Database::query($sql); + $sql = "DELETE FROM $t_settings WHERE variable = 'openmeetings_host'"; + Database::query($sql); + + //Old settings deleting just in case + $sql = "DELETE FROM $t_settings WHERE variable = 'openmeetings_plugin'"; + Database::query($sql); + $sql = "DELETE FROM $t_options WHERE variable = 'openmeetings_plugin'"; + Database::query($sql); +// $sql = "DELETE FROM $t_settings WHERE variable = 'openmeetings_plugin_host'"; +// Database::query($sql); +// $sql = "DELETE FROM $t_settings WHERE variable = 'openmeetings_plugin_salt'"; +// Database::query($sql); + + //hack to get rid of Database::query warning (please add c_id...) + $sql = "DELETE FROM $t_tool WHERE name = 'openmeetings' AND c_id = c_id"; + Database::query($sql); + + $sql = "DROP TABLE IF EXISTS plugin_openmeetings"; + Database::query($sql); + + //Deleting course settings + $this->uninstall_course_fields_in_all_courses(); + } +} diff --git a/plugin/openmeetings/lib/openmeetings_rest_service.php b/plugin/openmeetings/lib/openmeetings_rest_service.php new file mode 100644 index 0000000000..57db66015f --- /dev/null +++ b/plugin/openmeetings/lib/openmeetings_rest_service.php @@ -0,0 +1,181 @@ +loadXML($xml); + + if ($returnAttribute == "") { + //echo "XML".$xml."
"; + return $this->getArray($dom); + } else { + $returnNodeList = $dom->getElementsByTagName($returnAttribute); + $ret = array(); + foreach ($returnNodeList as $returnNode) { + if ($returnNodeList->length == 1) { + return $this->getArray($returnNode); + } else { + $ret[] = $this->getArray($returnNode); + } + } + return $ret; + } + + } + + function getArray($node) + { + if (is_null($node) || !is_object($node)) { + return $node; + } + $array = false; + /* + echo("!!!!!!!! NODE " . XML_TEXT_NODE + . " :: name = " . $node->nodeName + . " :: local = " . $node->localName + . " :: childs ? " . $node->hasChildNodes() + . " :: count = " . ($node->hasChildNodes() ? $node->childNodes->length : -1) + . " :: type = " . $node->nodeType + . " :: val = " . $node->nodeValue + . "\n"); + /* + if ($node->hasAttributes()) { + foreach ($node->attributes as $attr) { + $array[$attr->nodeName] = $attr->nodeValue; + } + } + */ + if ($node->hasChildNodes()) { + foreach ($node->childNodes as $childNode) { + if ($childNode->nodeType != XML_TEXT_NODE) { + if ($node->hasAttributes()) { + foreach ($node->attributes as $attr) { + if ($attr->localName == "nil") { + return null; + } + } + } + if ($childNode->childNodes->length == 1) { + $array[$childNode->localName] = $this->getArray($childNode); + } else { + $array[$childNode->localName][] = $this->getArray($childNode); + } + } else { + return $childNode->nodeValue; + //echo("!!!!!!!! TEXT " . $childNode->nodeValue . "\n"); + //$array[$childNode->localName] + } + } + } + + return $array; + } + + function getError() + { + return false; + } + + function fault() + { + return false; + } +} \ No newline at end of file diff --git a/plugin/openmeetings/lib/room.class.php b/plugin/openmeetings/lib/room.class.php new file mode 100644 index 0000000000..5433f4792d --- /dev/null +++ b/plugin/openmeetings/lib/room.class.php @@ -0,0 +1,115 @@ +isTeacher() ) ? 1 : 2 ; + */ + public $roomtypes_id = 1; + public $comment; + public $numberOfPartizipants = 40; + public $ispublic = false; + public $appointment = false; + public $isDemoRoom = false; + public $demoTime = 0; + public $isModeratedRoom = true; + public $externalRoomType = 'chamilolms'; + public $allowUserQuestions = false; + public $isAudioOnly = false; + public $waitForRecording = true; + public $allowRecording = true; + public $chamiloCourseId; + public $chamiloSessionId; + private $table; + + public function __construct() + { + $this->table = \Database::get_main_table('plugin_openmeetings'); + global $_configuration; + $this->name = 'C'.api_get_real_course_id().'-'.api_get_session_id(); + $accessUrl = api_get_access_url($_configuration['access_url']); + $this->externalRoomType = substr($accessUrl['url'], strpos($accessUrl['url'],'://')+3,-1); + if (strcmp($this->externalRoomType, 'localhost') == 0) { + $this->externalRoomType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH),'://')+3, -1); + } + $this->externalRoomType = 'chamilolms.'.$this->externalRoomType; + } + + /** + * Get Room by id + * @param int $id + */ + public function getRoom($id) + { + if (!empty($id)) { + $roomData = \Database::select('*', $this->table, array('where' => array('id = ?' => $id)), 'first'); + if (!empty($roomData)) { + $this->rooms_id = $this->room_id = $roomData['room_id']; + $this->status = $roomData['status']; + $this->name = $roomData['meeting_name']; + $this->comment = $roomData['welcome_msg']; + $this->allowRecording = $roomData['record']; + $this->chamiloCourseId = $roomData['c_id']; + $this->chamiloSessionId = $roomData['session_id']; + } + } + } + + /** + * Sets the room ID and loads as much info as possible from the local table + * @param int $id The room ID (from table.room_id) + */ + public function loadRoomId($id) + { + if (!empty($id)) { + $roomData = \Database::select('*', $this->table, array('where' => array('room_id = ?' => $id)), 'last'); + if (!empty($roomData)) { + $this->rooms_id = $this->room_id = $roomData['room_id']; + $this->status = $roomData['status']; + $this->name = $roomData['meeting_name']; + $this->comment = $roomData['welcome_msg']; + $this->allowRecording = $roomData['record']; + $this->chamiloCourseId = $roomData['c_id']; + $this->chamiloSessionId = $roomData['session_id']; + } + } + } + + /** + * Gets a string from a boolean attribute + * @param string $attribute Name of the attribute + * @param mixed $voidReturn What to return if the value is not defined + * @return string The boolean value expressed as string ('true' or 'false') + */ + public function getString($attribute, $voidReturn = false) + { + if (empty($attribute)) { + return false; + } + if (!isset($this->$attribute)) { + return $voidReturn; + } + return $this->$attribute?'true':'false'; + } +} diff --git a/plugin/openmeetings/lib/session.class.php b/plugin/openmeetings/lib/session.class.php new file mode 100644 index 0000000000..f78123df46 --- /dev/null +++ b/plugin/openmeetings/lib/session.class.php @@ -0,0 +1,16 @@ +get_lang('Videoconference'); +$tpl = new Template($tool_name); + +$om = new Chamilo\Plugin\OpenMeetings\OpenMeetings(); +$action = isset($_GET['action']) ? $_GET['action'] : null; +$teacher = $om->isTeacher(); + +api_protect_course_script(true); +$message = null; + +if ($teacher) { + switch ($action) { + case 'add_to_calendar': + $course_info = api_get_course_info(); + $agenda = new Agenda(); + $agenda->type = 'course'; + + $id = intval($_GET['id']); + $title = sprintf(get_lang('VideoConferenceXCourseX'), $id, $course_info['name']); + $content = Display::url(get_lang('GoToTheVideoConference'), $_GET['url']); + + $event_id = $agenda->add_event($_REQUEST['start'], null, 'true', null, $title, $content, array('everyone')); + if (!empty($event_id)) { + $message = Display::return_message(get_lang('VideoConferenceAddedToTheCalendar'), 'success'); + } else { + $message = Display::return_message(get_lang('Error'), 'error'); + } + break; + case 'copy_record_to_link_tool': + $result = $om->copy_record_to_link_tool($_GET['id'], $_GET['record_id']); + if ($result) { + $message = Display::return_message(get_lang('VideoConferenceAddedToTheLinkTool'), 'success'); + } else { + $message = Display::return_message(get_lang('Error'), 'error'); + } + break; + case 'delete_record': + /*$result = $om->delete_record($_GET['id']); + if ($result) { + $message = Display::return_message(get_lang('Deleted'), 'success'); + } else { + $message = Display::return_message(get_lang('Error'), 'error'); + }*/ + break; + case 'delete': + $om->deleteMeeting($_GET['id']); + unset($om); + $message = Display::return_message(get_lang('MeetingDeleted').'
'.get_lang('MeetingDeletedComment'), 'success', false); + header('Location: '.api_get_self()); + exit; + break; + case 'end': + $om->endMeeting($_GET['id']); + $message = Display::return_message(get_lang('MeetingClosed').'
'.get_lang('MeetingClosedComment'), 'success', false); + break; + case 'publish': + // Not implemented yet + //$result = $om->publish_meeting($_GET['id']); + break; + case 'unpublish': + // Not implemented yet + //$result = $om->unpublish_meeting($_GET['id']); + break; + default: + break; + } +} + +$meetings = $om->getCourseMeetings(); +$openMeeting = false; +$users_online = 0; + +if (!empty($meetings)) { + $meetings = array_reverse($meetings); + foreach ($meetings as $meeting) { + if ($meeting['status'] == 1) { + $openMeeting = true; + } + } + $users_online = $meetings->participantCount; +} + +$status = $om->isServerRunning(); +$show_join_button = false; +if ($openMeeting || $teacher) { + $show_join_button = true; +} + +$tpl->assign('allow_to_edit', $teacher); +$tpl->assign('meetings', $meetings); +$conference_url = api_get_path(WEB_PLUGIN_PATH).'openmeetings/start.php?launch=1&'.api_get_cidreq(); +$tpl->assign('conference_url', $conference_url); +$tpl->assign('users_online', $users_online); +$tpl->assign('openmeetings_status', $status); +$tpl->assign('show_join_button', $show_join_button); +$tpl->assign('message', $message); +$listing_tpl = 'openmeetings/listing.tpl'; +$content = $tpl->fetch($listing_tpl); +$tpl->assign('content', $content); +$tpl->display_one_col_template(); diff --git a/plugin/openmeetings/listing.tpl b/plugin/openmeetings/listing.tpl new file mode 100644 index 0000000000..4ffbafe0bd --- /dev/null +++ b/plugin/openmeetings/listing.tpl @@ -0,0 +1,66 @@ +
+
+{% if openmeetings_status == true %}
+ {% if show_join_button == true %}
+
+ {% endif %}
+
+
diff --git a/plugin/openmeetings/plugin.php b/plugin/openmeetings/plugin.php
new file mode 100644
index 0000000000..29dc86aefd
--- /dev/null
+++ b/plugin/openmeetings/plugin.php
@@ -0,0 +1,4 @@
+get_info();
diff --git a/plugin/openmeetings/readme.txt b/plugin/openmeetings/readme.txt
new file mode 100644
index 0000000000..d4f89ea2a9
--- /dev/null
+++ b/plugin/openmeetings/readme.txt
@@ -0,0 +1,16 @@
+This plugin will create a link in existing and new courses for the teachers to
+start a videoconference room with OpenMeetings, as well as the administration
+settings to configure this tool.
+
+More info on OpenMeetings: http://openmeetings.apache.org/
+More info on Chamilo: http://www.chamilo.org
+The tasks related to the development of this plugin:
+* https://support.chamilo.org/issues/5491
+* (private system access) https://task.beeznest.com/issues/7046
+* https://issues.apache.org/jira/browse/OPENMEETINGS-802
+People involved:
+* Financed by the Commission Scolaire des Hautes-Rivières, Québec, Canada (and coordinated/executed by the TICFP team)
+* First draft developed by Francis Gonzales Tello - Independent (at the time)
+* First stable version published by Yannick Warnier - BeezNest/Chamilo team
+* Maxim Solodovnik - OpenMeetings team - many thanks to him!
+* Julio Montoya - Corrections and adding features.
diff --git a/plugin/openmeetings/start.php b/plugin/openmeetings/start.php
new file mode 100644
index 0000000000..5bc59bd832
--- /dev/null
+++ b/plugin/openmeetings/start.php
@@ -0,0 +1,70 @@
+isServerRunning()) {
+
+ if (isset($_GET['launch']) && $_GET['launch'] == 1) {
+
+ $meeting_params = array();
+ $meeting_params['meeting_name'] = 'C'.api_get_course_id().'-'.api_get_session_id();
+ $meetings = $om->getCourseMeetings();
+
+ $selectedMeeting = array();
+ /*
+ // Select the meeting with more participantCount.
+ if (!empty($meetings)) {
+ $max = 0;
+ foreach ($meetings as $meeting) {
+ if ($meeting['participantCount'] > $max) {
+ $selectedMeeting = $meeting;
+ $max = $meeting['participantCount'];
+ }
+ }
+ }
+ */
+ // Check for the first meeting available with status = 1
+ // (there should be only one at a time, as createMeeting checks for that first
+ if (!empty($meetings)) {
+ foreach ($meetings as $meeting) {
+ if ($meeting['status'] == 1) {
+ $selectedMeeting = $meeting;
+ }
+ }
+ }
+
+ if (!empty($selectedMeeting)) {
+ $url = $om->joinMeeting($selectedMeeting['id']);
+ if ($url) {
+ header('location: '.$url);
+ exit;
+ }
+ } else {
+ if ($om->isTeacher()) {
+ $om->createMeeting($meeting_params);
+ exit;
+ } else {
+ $url = 'listing.php';
+ header('location: '.$url);
+ exit;
+ }
+ }
+ } else {
+ $url = 'listing.php';
+ header('location: '.$url);
+ exit;
+ }
+} else {
+ $message = Display::return_message(get_lang('ServerIsNotRunning'), 'warning');
+}
+$tpl->assign('message', $message);
+$tpl->display_one_col_template();
diff --git a/plugin/openmeetings/uninstall.php b/plugin/openmeetings/uninstall.php
new file mode 100644
index 0000000000..35be736762
--- /dev/null
+++ b/plugin/openmeetings/uninstall.php
@@ -0,0 +1,13 @@
+uninstall();
diff --git a/plugin/rss/plugin.php b/plugin/rss/plugin.php
index 2c6492619d..67446f1b0f 100644
--- a/plugin/rss/plugin.php
+++ b/plugin/rss/plugin.php
@@ -9,6 +9,7 @@
* @author Laurent Opprecht
*/
+require_once api_get_path(LIBRARY_PATH) . 'plugin.class.php';
require_once dirname(__FILE__) . '/lib/rss_plugin.class.php';
$plugin_info = RssPlugin::create()->get_info();
diff --git a/plugin/search_course/lib/register_course_widget.class.php b/plugin/search_course/lib/register_course_widget.class.php
index f6bab73239..397454f30a 100644
--- a/plugin/search_course/lib/register_course_widget.class.php
+++ b/plugin/search_course/lib/register_course_widget.class.php
@@ -1,10 +1,10 @@
subscribe_user($course_code, $registration_code)) {
+ if ($this->subscribe_user($course_code, $registration_code))
+ {
Display::display_confirmation_message(get_lang('EnrollToCourseSuccessful'));
-
return;
}
- if (!empty($registration_code)) {
+ if (!empty($registration_code))
+ {
Display::display_error_message(get_lang('CourseRegistrationCodeIncorrect'));
}
$this->display_form($course_code);
-
return true;
}
/**
* Regiser a user to a course.
* Returns true on success, false otherwise.
- *
+ *
* @param string $course_code
* @param string $registration_code
* @param int $user_id
- * @return bool
+ * @return bool
*/
function subscribe_user($course_code, $registration_code = '', $user_id = null)
{
- $course = $this->retrieve_course($course_code);
+ $course = $this->retrieve_course($course_code);
$course_regisration_code = $course['registration_code'];
- if (!empty($course_regisration_code) && $registration_code != $course_regisration_code) {
+ if (!empty($course_regisration_code) && $registration_code != $course_regisration_code)
+ {
return false;
}
- if (empty($user_id)) {
+ if (empty($user_id))
+ {
global $_user;
$user_id = $_user['user_id'];
}
- return (bool)CourseManager::add_user_to_course($user_id, $course['real_id']);
+ return (bool) CourseManager::add_user_to_course($user_id, $course_code);
}
/**
* Display the course registration form.
* Asks for registration code/password.
- *
+ *
* @param string $course_code
*/
function display_form($course_code)
{
global $stok;
- $course = $this->retrieve_course($course_code);
- $self = $_SERVER['REQUEST_URI'];
- $course_code = $course['code'];
- $course_visual_code = $course['visual_code'];
- $course_title = $course['title'];
+ $course = $this->retrieve_course($course_code);
+ $self = $_SERVER['REQUEST_URI'];
+ $course_code = $course['code'];
+ $course_visual_code = $course['visual_code'];
+ $course_title = $course['title'];
$submit_registration_code_label = get_lang("SubmitRegistrationCode");
$course_requires_password_label = get_lang('CourseRequiresPassword');
@@ -148,10 +152,11 @@ EOT;
/**
*
* @param type $course_code
- * @return type
+ * @return type
*/
function retrieve_course($course_code)
{
+ require_once api_get_path(SYS_PATH) . '/main/inc/lib/course.lib.php';
return CourseManager::get_course_information($course_code);
}
diff --git a/plugin/search_course/lib/search_course_widget.class.php b/plugin/search_course/lib/search_course_widget.class.php
index 586262967e..8c16580a3b 100644
--- a/plugin/search_course/lib/search_course_widget.class.php
+++ b/plugin/search_course/lib/search_course_widget.class.php
@@ -3,9 +3,9 @@
require_once dirname(__FILE__) . '/register_course_widget.class.php';
/**
- * Search course widget.
+ * Search course widget.
* Display a search form and a list of courses that matches the search.
- *
+ *
* @copyright (c) 2011 University of Geneva
* @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html
* @author Laurent Opprecht
@@ -18,10 +18,10 @@ class SearchCourseWidget
/**
* Returns $_POST data for $key is it exists or $default otherwise.
- *
+ *
* @param string $key
* @param object $default
- * @return string
+ * @return string
*/
public static function post($key, $default = '')
{
@@ -30,10 +30,10 @@ class SearchCourseWidget
/**
* Returns $_GET data for $key is it exists or $default otherwise.
- *
+ *
* @param string $key
* @param object $default
- * @return string
+ * @return string
*/
public static function get($key, $default = '')
{
@@ -91,7 +91,7 @@ class SearchCourseWidget
}
/**
- *
+ *
*/
function accept()
{
@@ -100,10 +100,10 @@ class SearchCourseWidget
/**
* Display the search course widget:
- *
+ *
* Title
* Search form
- *
+ *
* Search results
*/
function run()
@@ -216,7 +216,7 @@ EOT;
/**
*
* @param array $courses
- * @return bool
+ * @return bool
*/
function display_list($courses)
{
@@ -227,8 +227,8 @@ EOT;
$user_courses = $this->retrieve_user_courses();
- $display_coursecode = (api_get_setting('display_coursecode_in_courselist') == 'true');
- $display_teacher = (api_get_setting('display_teacher_in_courselist') == 'true');
+ $display_coursecode = (get_setting('display_coursecode_in_courselist') == 'true');
+ $display_teacher = (get_setting('display_teacher_in_courselist') == 'true');
echo '
+
+
+
+{% else %}
+
+
+
+ {{ 'RecordList'|get_lang }}
+| # | +{{ 'CreatedAt'|get_lang }} | +{{ 'Status'|get_lang }} | +{{ 'Records'|get_lang }} | + + {% if allow_to_edit %} +{{ 'Actions'|get_lang }} | + {% endif %} + +
|---|---|---|---|---|
| {{ meeting.id }} | +{{ meeting.created_at }} | ++ {% if meeting.status == 1 %} + {{ 'MeetingOpened'|get_lang }} + {% else %} + {{ 'MeetingClosed'|get_lang }} + {% endif %} + | ++ {% if meeting.record == 1 %} + {# Record list #} + {{ meeting.show_links }} + {% endif %} + | + + {% if allow_to_edit %} ++ {% if meeting.status == 1 %} + {{ 'CloseMeeting' | get_lang }} + {% endif %} + {{ 'DeleteMeeting' | get_lang }} + | + {% endif %} + +
+ {{ 'ServerIsNotRunning' | return_message('warning') }}
+
+{% endif %}
+![](\"'.api_get_path(WEB_CODE_PATH).'img/delete.gif\")
+ 
| Cliente: | +'.$user['firstname'].' '.$user['lastname'].' | +
| Usuario: | +'.$user['username'].' | +
| Fecha: | +'.api_convert_and_format_date($now, DATE_TIME_FORMAT_LONG).' | +
| Asunto: | +'.$subject.' | +
| Descripción: | +'.$content.' | +
Su consulta fue reenviada al area responsable : '.$email.'
'; + $mensaje_alumno .='La respuesta a su consulta será enviada al correo : '.$personalemail.'
'; + self::insert_message($ticket_id, "Mensaje Reenviado", $mensaje_alumno, null, 1); + } + return true; + }else{ + return false; + } + }else{ + return false; + } + } + public static function insert_message($ticket_id,$subject,$content,$file_attachments,$user_id,$status='NOL',$envioconfirmacion=false){ + global $data_files; + $table_support_messages = Database::get_main_table(TABLE_SUPPORT_MESSAGE); + $table_support_tickets = Database::get_main_table(TABLE_SUPPORT_TICKET); + $table_support_message_attachments = Database::get_main_table(TABLE_SUPPORT_MESSAGE_ATTACHMENTS); + if ($envioconfirmacion){ + $formulario = ''; + $content.=$formulario; + Database::query("UPDATE $table_support_tickets SET status_id='XCF' WHERE ticket_id = '$ticket_id'"); + } + $sql_message_id = "SELECT COUNT(*) as total_messages FROM ".$table_support_messages." WHERE ticket_id ='$ticket_id'"; + $result = Database::query($sql_message_id); + $obj = Database::fetch_object($result); + $message_id = $obj->total_messages+1; + $now = api_get_utc_datetime(); + $sql_insert_message = "INSERT INTO ".$table_support_messages." (ticket_id,message_id,subject, message,ip_address,sys_insert_user_id,sys_insert_datetime,sys_lastedit_user_id,sys_lastedit_datetime,status) + VALUES ('$ticket_id','$message_id','$subject','$content','".$_SERVER['REMOTE_ADDR']."','$user_id','".$now."','$user_id','".$now."','$status');"; + Database::query($sql_insert_message); + $sql_update_total_message ="UPDATE ".$table_support_tickets." SET sys_lastedit_user_id ='$user_id' , sys_lastedit_datetime ='".$now."' , total_messages = ("."SELECT COUNT(*) as total_messages FROM ".$table_support_messages." WHERE ticket_id ='$ticket_id'".") WHERE ticket_id ='$ticket_id' "; + Database::query($sql_update_total_message); + $sql_message_att_id = "SELECT COUNT(*) as total_attach FROM ".$table_support_message_attachments." WHERE ticket_id ='$ticket_id' AND message_id = '$message_id'"; + $result = Database::query($sql_message_att_id); + $obj = Database::fetch_object($result); + $message_attch_id = $obj->total_attach+1; + if (is_array($file_attachments)) { + foreach ($file_attachments as $file_attach) { + if ($file_attach['error'] == 0) { + $data_files[] = self::save_message_attachment_file($file_attach,$ticket_id,$message_id,$message_attch_id); + $message_attch_id++; + }else{ + if($file_attach['error']!=UPLOAD_ERR_NO_FILE )return false; + } + } + } + return true; + + + } + public static function save_message_attachment_file($file_attach,$ticket_id,$message_id,$message_attch_id) { + $now = api_get_ut; + $user_id = api_get_user_id(); + $new_file_name = add_ext_on_mime(stripslashes($file_attach['name']), $file_attach['type']); + $file_name =$file_attach['name']; + $table_support_message_attachments = Database::get_main_table(TABLE_SUPPORT_MESSAGE_ATTACHMENTS); + if (!filter_extension($new_file_name)) { + Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension')); + } else { + $new_file_name = uniqid(''); + $path_attachment = api_get_path(SYS_PATH); + $path_message_attach =$path_attachment.'tck_messageattch/'; + if (!file_exists($path_message_attach)) { + @mkdir($path_message_attach, api_get_permissions_for_new_directories(), true); + } + $new_path=$path_message_attach.$new_file_name; + if (is_uploaded_file($file_attach['tmp_name'])) { + $result= @copy($file_attach['tmp_name'], $new_path); + } + $safe_file_comment= Database::escape_string($file_comment); + $safe_file_name = Database::escape_string($file_name); + $safe_new_file_name = Database::escape_string($new_file_name); + $sql="INSERT INTO ".$table_support_message_attachments."(filename, path,ticket_id,message_id,message_attch_id,size,sys_insert_user_id,sys_insert_datetime,sys_lastedit_user_id,sys_lastedit_datetime) + VALUES ( '$safe_file_name', '$safe_new_file_name' , '$ticket_id','$message_id', '$message_attch_id','".$file_attach['size']."','$user_id','".$now."','$user_id','".$now."' )"; + $result=Database::query($sql); + return array('path' => $path_message_attach.$safe_new_file_name,'filename' => $safe_file_name); + } + } + public static function get_tickets_by_user_id($from, $number_of_items, $column, $direction ,$user_id=null){ + $table_support_category = Database::get_main_table(TABLE_SUPPORT_CATEGORY); + $table_support_tickets = Database::get_main_table(TABLE_SUPPORT_TICKET); + $table_support_priority = Database::get_main_table(TABLE_SUPPORT_PRIORITY); + $table_support_status = Database::get_main_table(TABLE_SUPPORT_STATUS); + $table_support_messages = Database::get_main_table(TABLE_SUPPORT_MESSAGE); + $table_main_user = Database::get_main_table(TABLE_MAIN_USER); + $table_main_admin = Database::get_main_table(TABLE_MAIN_ADMIN); + if(is_null($direction)) $direction ="DESC"; + if(is_null($user_id) || $user_id==0){ + $user_id = api_get_user_id(); + } + + $isAdmin = UserManager::is_admin($user_id); + $sql = "SELECT ticket.*, ticket.ticket_id AS col0,ticket.start_date AS col1, ticket.sys_lastedit_datetime AS col2 ,cat.name AS col3,user.username AS col4, priority.priority AS col5 , + priority.priority AS col6, status.name AS col7 , ticket.total_messages AS col8, msg.message AS col9, ticket.request_user AS user_id , ticket.assigned_last_user AS responsable + FROM ".$table_support_tickets." ticket ,".$table_support_category." cat , ".$table_support_priority ." priority, ".$table_support_status ." status , ".Database::get_main_table(TABLE_MAIN_USER)." user, tck_message msg + WHERE cat.category_id = ticket.category_id AND ticket.priority_id = priority.priority_id AND ticket.status_id = status.status_id AND user.user_id = ticket.request_user + AND ticket.ticket_id= msg.ticket_id AND message_id=1 "; + if(!$isAdmin){ + $sql.=" AND request_user = '$user_id' "; + } + $keyword_unread = Database::escape_string(trim($_GET['keyword_unread'])); + //Search simple + if(isset($_GET['submit_simple'])){ + if($_GET['keyword']!=''){ + $keyword = Database::escape_string(trim($_GET['keyword'])); + $sql.=" AND (ticket.ticket_code = '".$keyword."' OR ticket.ticket_id = '".$keyword."' OR user.firstname LIKE '%".$keyword."%' OR user.lastname LIKE '%".$keyword."%' OR concat(user.firstname,' ',user.lastname) LIKE '%".$keyword."%' OR concat(user.lastname,' ',user.firstname) LIKE '%".$keyword."%' OR user.username LIKE '%".$keyword."%') "; + } + } + //Search advanced + if(isset($_GET['submit_advanced'])){ + $keyword_category = Database::escape_string(trim($_GET['keyword_category'])); + $keyword_request_user = Database::escape_string(trim($_GET['keyword_request_user'])); + $keyword_admin = Database::escape_string(trim($_GET['keyword_admin'])); + $keyword_start_date_start = Database::escape_string(trim($_GET['keyword_start_date_start'])); + $keyword_start_date_end = Database::escape_string(trim($_GET['keyword_start_date_end'])); + $keyword_status = Database::escape_string(trim($_GET['keyword_status'])); + $keyword_source = Database::escape_string(trim($_GET['keyword_source'])); + $keyword_priority = Database::escape_string(trim($_GET['keyword_priority'])); + $keyword_range = Database::escape_string(trim($_GET['keyword_dates'])); + $keyword_course = Database::escape_string(trim($_GET['keyword_course'])); + + if($keyword_category !=''){ + $sql.=" AND ticket.category_id = '$keyword_category' "; + } + if($keyword_request_user !=''){ + $sql.=" AND (ticket.request_user = '$keyword_request_user' OR user.firstname LIKE '%".$keyword_request_user."%' OR user.official_code LIKE '%".$keyword_request_user."%' OR user.lastname LIKE '%".$keyword_request_user."%' OR concat(user.firstname,' ',user.lastname) LIKE '%".$keyword_request_user."%' OR concat(user.lastname,' ',user.firstname) LIKE '%".$keyword_request_user."%' OR user.username LIKE '%".$keyword_request_user."%') "; + } + if($keyword_admin !=''){ + $sql.=" AND ticket.assigned_last_user = '$keyword_admin' "; + } + if($keyword_status !=''){ + $sql.=" AND ticket.status_id = '$keyword_status' "; + } + if($keyword_range == '' && $keyword_start_date_start!=''){ + $sql.= " AND DATE_FORMAT( ticket.start_date,'%d/%m/%Y') = '$keyword_start_date_start' "; + } + if ($keyword_range == '1' && $keyword_start_date_start!='' && $keyword_start_date_end !=''){ + $sql.= " AND DATE_FORMAT( ticket.start_date,'%d/%m/%Y') >= '$keyword_start_date_start' AND DATE_FORMAT( ticket.start_date,'%d/%m/%Y') <= '$keyword_start_date_end'"; + } + if ($keyword_priority != ''){ + $sql.=" AND ticket.priority_id = '$keyword_priority' "; + } + if($keyword_source != ''){ + $sql.= " AND ticket.source = '$keyword_source' "; + } + if($keyword_priority != ''){ + $sql.= " AND ticket.priority_id = '$keyword_priority' "; + } + if ($keyword_course != ''){ + $course_table = Database :: get_main_table(TABLE_MAIN_COURSE); + $sql .= " AND ticket.course_id IN ( "; + $sql .= "SELECT id FROM $course_table WHERE (title LIKE '%".$keyword_course."%' OR code LIKE '%".$keyword_course."%' OR visual_code LIKE '%".$keyword_course."%' )) "; + } + + } + if($keyword_unread == 'yes'){ + $sql.= " AND ticket.ticket_id IN (SELECT ticket.ticket_id FROM $table_support_tickets ticket, $table_support_messages message, $table_main_user user WHERE ticket.ticket_id = message.ticket_id AND message.status = 'NOL' AND message.sys_insert_user_id = user.user_id AND user.user_id NOT IN (SELECT user_id FROM $table_main_admin) AND ticket.status_id != 'REE' GROUP BY ticket.ticket_id)"; + }else if($keyword_unread == 'no'){ + $sql.= " AND ticket.ticket_id NOT IN (SELECT ticket.ticket_id FROM $table_support_tickets ticket, $table_support_messages message, $table_main_user user WHERE ticket.ticket_id = message.ticket_id AND message.status = 'NOL' AND message.sys_insert_user_id = user.user_id AND user.user_id NOT IN (SELECT user_id FROM $table_main_admin) AND ticket.status_id != 'REE' GROUP BY ticket.ticket_id)"; + } + $sql .= " ORDER BY col$column $direction"; + $sql .= " LIMIT $from,$number_of_items"; + $result = Database::query($sql); + $tickets = array(); + while ($row = Database::fetch_assoc($result)){ + $sql_unread = "SELECT COUNT(DISTINCT message.message_id) AS unread FROM ".$table_support_tickets." ticket, ".$table_support_messages." message, ".$table_main_user." user + WHERE ticket.ticket_id = message.ticket_id AND ticket.ticket_id= '".$row['col0']."' AND message.status='NOL' AND message.sys_insert_user_id = user.user_id "; + if($isAdmin){ + $sql_unread .=" AND user.user_id NOT IN (SELECT user_id FROM $table_main_admin) AND ticket.status_id != 'REE' "; + }else{ + $sql_unread .=" AND user.user_id IN (SELECT user_id FROM $table_main_admin) "; + } + $result_unread = Database::query($sql_unread); + $unread = Database::fetch_object($result_unread)->unread; + $userinfo = UserManager::get_user_info_by_id($row['user_id']); + $name = ''.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).''; + $actions = ""; + /*if($row['status_id']!='CLS' && $row['status_id']!='REE'){ + if( $row['responsable'] != 0 && $row['responsable'] == $user_id ){ + $actions = '
';
+ }else{
+ $actions = '
';
+ }
+ }*/
+ if( $row['responsable'] != 0){
+ $row['responsable']= api_get_user_info($row['responsable']);
+ $row['responsable']= ''.$row['responsable']['firstname'].' '.$row['responsable']['lastname'].'';
+ }else if($row['status_id']!='REE'){
+ $row['responsable'] = 'Por Asignar';
+ }else{
+ $row['responsable'] = 'REENVIADO';
+ }
+ switch ($row['source']){
+ case 'PRE':
+ $img_source = '../img/icons/32/user.png';
+ break;
+ case 'MAI':
+ $img_source = '../img/icons/32/mail.png';
+ break;
+ case 'TEL':
+ $img_source = '../img/icons/32/event.png';
+ break;
+ default:
+ $img_source = '../img/icons/32/course_home.png';
+ break;
+ }
+ $row['col1'] = api_get_local_time($row['col1']);
+ $row['col2'] = api_get_local_time($row['col2']);
+ if($isAdmin){
+ $actions .= ''.Display::return_icon('synthese_view.gif', get_lang('Info')).' ';
+ if($row['priority_id']=='ALT' && $row['status_id']!='CLS') $actions .= '
';
+ $row['col0'] = Display::return_icon($img_source, get_lang('Info')).''.$row['ticket_code'].'';
+ if($row['col7']=='PENDIENTE'){
+ $row['col7'] = ''.$row['col7'].'';
+ }
+ //programa: $userinfo['extra']['programa']
+ $ticket=array($row['col0'],api_format_date($row['col1'],'%d/%m/%y - %I:%M:%S %p'),api_format_date($row['col2'],'%d/%m/%y - %I:%M:%S %p'),$row['col3'],$name,$row['responsable'],$row['col7'],$row['col8'],$actions, eregi_replace("[\n|\r|\n\r|\r\n]", ' ', strip_tags($row['col9'])) );
+ }else{
+ $actions ="";
+ $actions .= ''.Display::return_icon('synthese_view.gif', get_lang('Info')).' ';
+ $row['col0'] =Display::return_icon($img_source, get_lang('Info')).''.$row['ticket_code'].'';
+ $now = api_strtotime(api_get_utc_datetime());
+ $last_edit_date = api_strtotime($row['sys_lastedit_datetime']);
+ $dif = $now - $last_edit_date ;
+
+ if($dif > 172800 && $row['priority_id'] == 'NRM' && $row['status_id']!='CLS'){
+ $actions .= '';
+ }
+ if($row['priority_id']=='ALT') $actions .= '';
+ $ticket=array($row['col0'],api_format_date($row['col1'],'%d/%m/%y - %I:%M:%S %p'),api_format_date($row['col2'],'%d/%m/%y - %I:%M:%S %p'),$row['col3'],$row['col7'],$actions);
+ }
+ if($unread > 0){
+
+ $ticket['0']=$ticket['0'].' ('.$unread.')
';
+
+ }
+ if ($isAdmin)
+ $ticket['0'].= '
+ 
+ Estimado(a):
'.$info['firstname']." ".$info['lastname']."
+Te asignaron el ticket $ticket_id ".'Ticket
+Centro de Educación Virtual
'; + api_mail_html($info['firstname']." ".$info['lastname'], $info['mail'], "[TICKETS] Asignacion de Ticket #$ticket_id ", $mensaje,'Plataforma Virtual', 'plataformavirtual@usil.edu.pe', array('cc'=>'plataformavirtual@usil.edu.pe')); + } + } + } + public static function update_message_status($ticket_id,$user_id){ + $table_support_messages = Database::get_main_table(TABLE_SUPPORT_MESSAGE); + $sql = "UPDATE ".$table_support_messages." SET status = 'LEI' , sys_lastedit_user_id ='".api_get_user_id()."' ,sys_lastedit_datetime ='".$now."' WHERE ticket_id ='$ticket_id' "; + + if(api_is_platform_admin()){ + $sql .= " AND sys_insert_user_id = '$user_id'"; + }else{ + + $sql .= " AND sys_insert_user_id != '$user_id'"; + } + Database::query($sql); + if(Database::affected_rows()>0){ + Database::query("UPDATE ".Database::get_main_table(TABLE_SUPPORT_TICKET)." SET status_id = 'PND' WHERE ticket_id ='$ticket_id' AND status_id = 'NAT'"); + return true; + }else{ + return false; + } + } + public static function update_ticket_status($status_id,$ticket_id, $user_id){ + $table_support_tickets = Database::get_main_table(TABLE_SUPPORT_TICKET); + $table_support_messages = Database::get_main_table(TABLE_SUPPORT_MESSAGE); + $now = api_get_utc_datetime(); + $sql = "UPDATE ".$table_support_tickets." SET status_id = '$status_id' , sys_lastedit_user_id ='$user_id' ,sys_lastedit_datetime ='".$now."' WHERE ticket_id ='$ticket_id'"; + Database::query($sql); + if(Database::affected_rows()>0){ + return true; + }else{ + return false; + } + } + public static function get_number_of_messages(){ + $table_support_tickets = Database::get_main_table(TABLE_SUPPORT_TICKET); + $table_support_messages = Database::get_main_table(TABLE_SUPPORT_MESSAGE); + $table_main_user = Database::get_main_table(TABLE_MAIN_USER); + $table_main_admin = Database::get_main_table(TABLE_MAIN_ADMIN); + $user_info = api_get_user_info(); + $user_id = $user_info['user_id']; + $sql ="SELECT COUNT( DISTINCT ticket.ticket_id) AS unread FROM ".$table_support_tickets." ticket, ".$table_support_messages." message , ".$table_main_user." user WHERE ticket.ticket_id = message.ticket_id AND message.status = 'NOL' AND user.user_id = message.sys_insert_user_id "; + if(!api_is_platform_admin()){ + $sql .=" AND ticket.request_user = '$user_id' AND user_id IN (SELECT user_id FROM $table_main_admin) "; + }else{ + $sql .=" AND user_id NOT IN (SELECT user_id FROM $table_main_admin) AND ticket.status_id != 'REE'"; + } + $sql .= " AND ticket.project_id != '' "; + $res = Database::query($sql); + $obj = Database::fetch_object($res); + return $obj->unread; + + } + public static function send_alert($ticket_id,$user_id){ + $table_support_tickets = Database::get_main_table(TABLE_SUPPORT_TICKET); + $now = api_get_utc_datetime(); + $sql = "UPDATE ".$table_support_tickets." SET priority_id = 'ALT', sys_lastedit_user_id ='$user_id' ,sys_lastedit_datetime ='".$now."' WHERE ticket_id = '$ticket_id'"; + Database::query($sql); + } + public static function close_ticket($ticket_id, $user_id){ + $table_support_tickets = Database::get_main_table(TABLE_SUPPORT_TICKET); + $now = api_get_utc_datetime(); + $sql = "UPDATE ".$table_support_tickets." SET status_id = 'CLS' , sys_lastedit_user_id ='$user_id' ,sys_lastedit_datetime ='".$now."' ,end_date ='".$now."' WHERE ticket_id ='$ticket_id'"; + Database::query($sql); + } + public static function close_old_tickets(){ + $table_support_tickets = Database::get_main_table(TABLE_SUPPORT_TICKET); + $now = api_get_utc_datetime(); + $sql = "UPDATE ".$table_support_tickets." SET status_id = 'CLS' , sys_lastedit_user_id ='".api_get_user_id()."' ,sys_lastedit_datetime ='".$now."',end_date ='".$now."' WHERE DATEDIFF('$now',sys_lastedit_datetime) > 7 AND status_id != 'CLS' AND status_id != 'NAT' AND status_id != 'REE'"; + Database::query($sql); + } + public static function get_assign_log($ticket_id){ + $table_support_assigned_log = Database::get_main_table(TABLE_SUPPORT_ASSIGNED_LOG); + $sql = "SELECT log.* FROM ".TABLE_SUPPORT_ASSIGNED_LOG." log WHERE log.ticket_id = '$ticket_id' ORDER BY log.assigned_date"; + $result = Database::query($sql); + $history = array(); + while ($row = Database::fetch_assoc($result)){ + if ($row['user_id'] != 0) $assignuser = api_get_user_info($row['user_id']); + $insertuser = api_get_user_info($row['sys_insert_user_id']); + $row['assigned_date'] = api_convert_and_format_date(api_get_local_time($row['assigned_date']), '%d/%m/%y-%H:%M:%S',_api_get_timezone()); + $row['assignuser']= ($row['user_id'] != 0)?(''.$assignuser['username'].'') : get_lang('Unassign'); + $row['insertuser']= ''.$insertuser['username'].''; + $history[]=$row; + } + return $history; + } + public static function export_tickets_by_user_id($from, $number_of_items, $column, $direction ,$user_id=null){ + $table_support_category = Database::get_main_table(TABLE_SUPPORT_CATEGORY); + $table_support_tickets = Database::get_main_table(TABLE_SUPPORT_TICKET); + $table_support_priority = Database::get_main_table(TABLE_SUPPORT_PRIORITY); + $table_support_status = Database::get_main_table(TABLE_SUPPORT_STATUS); + $table_support_messages = Database::get_main_table(TABLE_SUPPORT_MESSAGE); + $table_main_user = Database::get_main_table(TABLE_MAIN_USER); + if(is_null($direction)) $direction ="DESC"; + if(is_null($user_id) || $user_id==0){ + $user_id = api_get_user_id(); + } + + $sql = "SELECT ticket.ticket_code, ticket.sys_insert_datetime , ticket.sys_lastedit_datetime , cat.name as category , CONCAT(user.lastname,' ', user.firstname) AS fullname , status.name as status , ticket.total_messages as messages , ticket.assigned_last_user as responsable + FROM ".$table_support_tickets." ticket ,".$table_support_category." cat , ".$table_support_priority ." priority, ".$table_support_status ." status , ".Database::get_main_table(TABLE_MAIN_USER)." user + WHERE cat.category_id = ticket.category_id AND ticket.priority_id = priority.priority_id AND ticket.status_id = status.status_id AND user.user_id = ticket.request_user "; + //Search simple + if(isset($_GET['submit_simple'])){ + if($_GET['keyword']!=''){ + $keyword = Database::escape_string(trim($_GET['keyword'])); + $sql.=" AND (ticket.ticket_code = '".$keyword."' OR user.firstname LIKE '%".$keyword."%' OR user.lastname LIKE '%".$keyword."%' OR concat(user.firstname,' ',user.lastname) LIKE '%".$keyword."%' OR concat(user.lastname,' ',user.firstname) LIKE '%".$keyword."%' OR user.username LIKE '%".$keyword."%') "; + } + } + //Search advanced + if(isset($_GET['submit_advanced'])){ + $keyword_category = Database::escape_string(trim($_GET['keyword_category'])); + $keyword_request_user = Database::escape_string(trim($_GET['keyword_request_user'])); + $keyword_admin = Database::escape_string(trim($_GET['keyword_admin'])); + $keyword_start_date_start = Database::escape_string(trim($_GET['keyword_start_date_start'])); + $keyword_start_date_end = Database::escape_string(trim($_GET['keyword_start_date_end'])); + $keyword_status = Database::escape_string(trim($_GET['keyword_status'])); + $keyword_source = Database::escape_string(trim($_GET['keyword_source'])); + $keyword_priority = Database::escape_string(trim($_GET['keyword_priority'])); + $keyword_range = Database::escape_string(trim($_GET['keyword_dates'])); + $keyword_unread = Database::escape_string(trim($_GET['keyword_unread'])); + $keyword_course = Database::escape_string(trim($_GET['keyword_course'])); + + if($keyword_category !=''){ + $sql.=" AND ticket.category_id = '$keyword_category' "; + } + if($keyword_request_user !=''){ + $sql.=" AND (ticket.request_user = '$keyword_request_user' OR user.firstname LIKE '%".$keyword_request_user."%' OR user.official_code LIKE '%".$keyword_request_user."%' OR user.lastname LIKE '%".$keyword_request_user."%' OR concat(user.firstname,' ',user.lastname) LIKE '%".$keyword_request_user."%' OR concat(user.lastname,' ',user.firstname) LIKE '%".$keyword_request_user."%' OR user.username LIKE '%".$keyword_request_user."%') "; + } + if($keyword_admin !=''){ + $sql.=" AND ticket.assigned_last_user = '$keyword_admin' "; + } + if($keyword_status !=''){ + $sql.=" AND ticket.status_id = '$keyword_status' "; + } + if($keyword_range == '' && $keyword_start_date_start!=''){ + $sql.= " AND DATE_FORMAT( ticket.start_date,'%d/%m/%Y') = '$keyword_start_date_start' "; + } + if ($keyword_range == '1' && $keyword_start_date_start!='' && $keyword_start_date_end !=''){ + $sql.= " AND DATE_FORMAT( ticket.start_date,'%d/%m/%Y') >= '$keyword_start_date_start' AND DATE_FORMAT( ticket.start_date,'%d/%m/%Y') <= '$keyword_start_date_end'"; + } + if ($keyword_priority != ''){ + $sql.=" AND ticket.priority_id = '$keyword_priority' "; + } + if($keyword_source != ''){ + $sql.= " AND ticket.source = '$keyword_source' "; + } + if($keyword_priority != ''){ + $sql.= " AND ticket.priority_id = '$keyword_priority' "; + } + if ($keyword_course != ''){ + $course_table = Database :: get_main_table(TABLE_MAIN_COURSE); + $sql .= " AND ticket.course_id IN ( "; + $sql .= "SELECT id FROM $course_table WHERE (title LIKE '%".$keyword_course."%' OR code LIKE '%".$keyword_course."%' OR visual_code LIKE '%".$keyword_course."%' )) "; + } + if($keyword_unread == 'yes'){ + $sql.= " AND ticket.ticket_id IN (SELECT ticket.ticket_id FROM $table_support_tickets ticket, $table_support_messages message, $table_main_user user WHERE ticket.ticket_id = message.ticket_id AND message.status = 'NOL' AND message.sys_insert_user_id = user.user_id AND user.status != 1 AND ticket.status_id != 'REE' GROUP BY ticket.ticket_id)"; + }else if($keyword_unread == 'no'){ + $sql.= " AND ticket.ticket_id NOT IN (SELECT ticket.ticket_id FROM $table_support_tickets ticket, $table_support_messages message, $table_main_user user WHERE ticket.ticket_id = message.ticket_id AND message.status = 'NOL' AND message.sys_insert_user_id = user.user_id AND user.status != 1 AND ticket.status_id != 'REE' GROUP BY ticket.ticket_id)"; + } + + } + + + //$sql .= " ORDER BY col$column $direction"; + $sql .= " LIMIT $from,$number_of_items"; + + $result = Database::query($sql); + $tickets[0] = array(utf8_decode('Ticket#'), utf8_decode('Fecha'), utf8_decode('Fecha Edicion'), utf8_decode('Categoria'), utf8_decode('Usuario'), utf8_decode('Estado'), utf8_decode('Mensajes'), utf8_decode('Responsable') , utf8_decode('Programa') ) ; + + while ($row = Database::fetch_assoc($result)){ + if( $row['responsable'] != 0){ + $row['responsable']= api_get_user_info($row['responsable']); + $row['responsable']= $row['responsable']['firstname'].' '.$row['responsable']['lastname']; + } + $row['sys_insert_datetime'] = api_format_date($row['sys_insert_datetime'],'%d/%m/%y - %I:%M:%S %p'); + $row['sys_lastedit_datetime'] = api_format_date($row['sys_lastedit_datetime'],'%d/%m/%y - %I:%M:%S %p'); + $row['category'] = utf8_decode($row['category']); + $row['programa'] = utf8_decode($row['fullname']); + $row['fullname'] = utf8_decode($row['fullname']); + $row['responsable'] = utf8_decode($row['responsable']); + $tickets[] = $row; + } + return $tickets; + } +} +?> \ No newline at end of file diff --git a/plugin/ticket/s/ticket_assign_log.php b/plugin/ticket/s/ticket_assign_log.php new file mode 100644 index 0000000000..c254570989 --- /dev/null +++ b/plugin/ticket/s/ticket_assign_log.php @@ -0,0 +1,26 @@ + +| + | ||
| + | + | + |
Ticket #'.$ticket['ticket']['ticket_code'].'
';
+ }else{
+ $img_assing .= '';
+ }
+ }
+ $negrita = ($ticket['ticket']['status_id'] == 'CLS')?'style = "font-weight: bold;"':'';
+ $cadena = ($ticket['ticket']['status_id'] != 'CLS')?"sas":"";
+ echo '
+
+
';
+ $messages = $ticket['messages'];
+ foreach($messages as $message){
+ $class ="messageuser";
+ if($message['admin']){
+ $class ="messagesupport";
+ if($isAdmin)$message['message'].="| '.$titulo.' | +'.$img_assing.' | +'.$form_close_ticket.' | +||
Enviado : '.$ticket['ticket']['start_date'].' |
+ + | Ultima Respuesta : '.$ticket['ticket']['sys_lastedit_datetime'].' |
+ + | |
Asunto : '.$ticket['messages'][0]['subject'].' |
+ + | Estado : '.$ticket['ticket']['status'].' |
+ + | |
Categoria : '.$ticket['ticket']['name'].' |
+ + | Prioridad :'.$ticket['ticket']['priority'].' |
+ + | |
Curso: |
+ + | '.$ticket['ticket']['course_url'].' | ++ | |
Usuario: |
+ + | '.$user_info = $ticket['ticket']['user_url'].' ('.$ticket['usuario']['username'].') | ++ | |
Atendido por: ".$message['user_created']." - ".api_convert_and_format_date(api_get_local_time($message['sys_insert_datetime']), DATE_TIME_FORMAT_LONG,_api_get_timezone()).""; + }else{ + $message['message'].="Enviado: ".api_convert_and_format_date(api_get_local_time($message['sys_insert_datetime']), DATE_TIME_FORMAT_LONG,_api_get_timezone()).""; + } + echo '
Asunto: '.$message['subject'].'
Mensaje:'.$message['message'].'
'; + if(isset($message['atachments'])){ + foreach($message['atachments'] as $attach){ + echo $attach['attachment_link']; + } + } + echo '
';
+ }
+ $asunto = "RE: ".$message['subject'];
+ $user_admin = api_is_platform_admin();
+ if($ticket['ticket']['status_id'] != 'REE' AND $ticket['ticket']['status_id'] != 'CLS' ){
+ if(!$isAdmin && $ticket['ticket']['status_id'] != 'XCF'){
+ show_form_send_message();
+ }else{
+ if(intval($ticket['ticket']['assigned_last_user']) == $user_id){
+ show_form_send_message();
+ $cheked ="";
+
+ }
+ }
+ }
+
+}else{
+ $ticket_id = $_POST['ticket_id'];
+ $content = $_POST['content'];
+ $subject = $_POST['subject'];
+ $mensajeconfirmacion = isset($_POST['confirmacion'])?true:false ;
+ $file_attachments = $_FILES;
+ $user_id = api_get_user_id();
+ TicketManager::insert_message($ticket_id, $subject, $content, $file_attachments, $user_id,'NOL',$mensajeconfirmacion);
+ header("location:".api_get_self()."?ticket_id=".$ticket_id);
+}
+function show_form_send_message(){
+ global $isAdmin;
+ global $ticket;
+ global $asunto;
+ echo '';
+}
+Display::display_footer();
+?>
\ No newline at end of file
diff --git a/plugin/ticket/s/tutor.php b/plugin/ticket/s/tutor.php
new file mode 100644
index 0000000000..50e6ca7831
--- /dev/null
+++ b/plugin/ticket/s/tutor.php
@@ -0,0 +1,101 @@
+
+$(document).ready(function (){
+ $(".ajax").live("click", function() {
+ var url = this.href;
+ var dialog = $("#dialog");
+ if ($("#dialog").length == 0) {
+ dialog = $("").appendTo("body");
+ }
+
+ // load remote content
+ dialog.load(
+ url,
+ {},
+ function(responseText, textStatus, XMLHttpRequest) {
+ dialog.dialog({
+ modal : true,
+ width : 540,
+ height : 400
+ });
+ });
+ //prevent the browser to follow the link
+ return false;
+ });
+});
+
+
+function mostrarContenido(div){
+ if($("div#"+div).attr("class")=="blackboard_hide"){
+ $("div#"+div).attr("class","blackboard_show");
+ $("div#"+div).attr("style","");
+ }else{
+ $("div#"+div).attr("class","blackboard_hide");
+ $("div#"+div).attr("style","");
+ }
+
+}
+
+function save() {
+ work_id = $("#work_id").val();
+ forum_id = $("#forum_id").val();
+ rs_id = $("#rs_id").val();
+ $.ajax({
+ contentType: "application/x-www-form-urlencoded",
+ beforeSend: function(objeto) {
+ $("div#confirmacion").html("Mensaje:'.$message['message'].'
'; + if(isset($message['atachments'])){ + foreach($message['atachments'] as $attach){ + echo $attach['attachment_link']; + } + } + echo '
"); },
+ type: "POST",
+ url: "update_report.php",
+ data: "work_id="+work_id+"&forum_id="+forum_id+"&rs_id="+rs_id,
+ success: function(datos) {
+ $("div#confirmacion").html(datos);
+ location.reload();
+ }
+ });
+}
+
+';
+
+$course_code = api_get_course_id();
+$resultado = inicializarReporte($course_code);
+if(isset($_GET['action'])){
+ Export::export_table_xls($resultado['exportar'],"REPORTE ALUMNOS CURSO".$course_code);
+}else{
+ Display::display_header();
+ api_protect_course_script();
+ if (!api_is_allowed_to_edit()){
+ api_not_allowed();
+ }
+ echo $resultado['mostrar'];
+ Display::display_footer();
+}
+?>
\ No newline at end of file
diff --git a/plugin/ticket/s/tutor_report.lib.php b/plugin/ticket/s/tutor_report.lib.php
new file mode 100644
index 0000000000..7d3bae2786
--- /dev/null
+++ b/plugin/ticket/s/tutor_report.lib.php
@@ -0,0 +1,190 @@
+semanas==0)?7:$semanas->semanas):$_POST['numerosemanas'];
+ Database::query("REPLACE INTO $table_semanas_curso (course_code , semanas) VALUES ('$course_code','$numero_semanas')");
+ if(intval($obj->cant) != $numero_semanas){
+
+ if(intval($obj->cant) > $numero_semanas){
+ $sql ="DELETE FROM $table_reporte_semanas WHERE week_id > $numero_semanas AND course_code = '$course_code'";
+ Database::query("DELETE FROM $table_reporte_semanas WHERE week_id > $numero_semanas AND course_code = '$course_code'");
+ }else{
+ for ($i = $obj->cant+1 ; $i <= $numero_semanas ; $i++){
+ if(!Database::query("INSERT INTO $table_reporte_semanas (week_id,course_code,forum_id,work_id,quiz_id,pc_id)
+ VALUES ('$i','$course_code','0','0','0','0' )")){
+ return false;
+ }
+ }
+ }
+ }
+
+ $sql = "REPLACE INTO $table_students_report (user_id,week_report_id, work_ok , thread_ok , quiz_ok , pc_ok)
+ SELECT cu.user_id, rs.id, 0, 0, 0, 0
+ FROM $table_course_rel_user cu
+ LEFT JOIN $table_reporte_semanas rs ON cu.course_code = rs.course_code
+ WHERE cu.status = '5' AND rs.course_code = '$course_code'
+ ORDER BY cu.user_id, rs.id";
+ if(!Database::query($sql)){
+ return false;
+ }else{
+ $pagina = (!isset($_GET['page']))?1:$_GET['page'];
+ Database::query("UPDATE $table_students_report sr SET sr.work_ok = 1
+ WHERE CONCAT (sr.user_id,',',sr.week_report_id)
+ IN (SELECT DISTINCT CONCAT(w.user_id,',',rs.id)
+ FROM $table_work w JOIN $table_reporte_semanas rs ON w.parent_id = rs.work_id)");
+ Database::query("UPDATE $table_students_report sr SET sr.thread_ok = 1
+ WHERE CONCAT (sr.user_id,',',sr.week_report_id)
+ IN (SELECT DISTINCT CONCAT(f.poster_id,',',rs.id)
+ FROM $table_post f JOIN $table_reporte_semanas rs ON f.thread_id = rs.forum_id)");
+ return mostrarResultados($course_info,$numero_semanas,$pagina);
+ }
+
+}
+function mostrarResultados($course_info,$numero_semanas, $pagina){
+ $course_code = $course_info['code'];
+ $table_reporte_semanas = Database::get_main_table('rp_reporte_semanas');
+ $table_students_report = Database::get_main_table('rp_students_report');
+ $table_course_rel_user = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+ $table_user = Database::get_main_table(TABLE_MAIN_USER );
+ $table_thread = Database::get_course_table(TABLE_FORUM_THREAD, $course_info['dbName']);
+ $table_work = Database::get_course_table(TABLE_STUDENT_PUBLICATION, $course_info['dbName']);
+
+ $resultados = array();
+ $table_export = array();
+ $sql_encabezado = "SELECT rs.id as id,rs.week_id, w.title AS work_title, t.thread_title ,'EVALUACION' as eval_title ,'QUIZ' as pc_title
+ FROM $table_reporte_semanas rs
+ LEFT JOIN $table_thread t ON t.thread_id = rs.forum_id
+ LEFT JOIN $table_work w ON w.id = rs.work_id
+ WHERE rs.course_code = '$course_code'
+ ORDER BY rs.week_id";
+ $result_encabezado = Database::query($sql_encabezado) ;
+ $ids = array();
+ $fila = ''.$rowe['work_title'].'
+ '.$rowe['thread_title'].'
+
+ '.$rowe['eval_title'].'
+
+ '.$rowe['pc_title'].'
+
+