From f3369390f73e50c8a0cfd38bad10a9ca89feb3b9 Mon Sep 17 00:00:00 2001
From: Myriam Delaruelle
<Myriam Delaruelle@bdn-un-mdelarue.ad.univ-lorraine.fr>
Date: Wed, 27 Oct 2021 10:14:21 +0200
Subject: [PATCH] removes timestamp from course->shortname
---
entity/block_mahara_iena_connexion.php | 20 +++++++++++++-------
lib.php | 19 +++++++++++++++++++
mahara_iena.php | 6 ++++--
mahara_iena_groups.php | 14 ++------------
4 files changed, 38 insertions(+), 21 deletions(-)
create mode 100644 lib.php
diff --git a/entity/block_mahara_iena_connexion.php b/entity/block_mahara_iena_connexion.php
index e71f8f1..b5b11a1 100644
--- a/entity/block_mahara_iena_connexion.php
+++ b/entity/block_mahara_iena_connexion.php
@@ -195,9 +195,12 @@ class block_mahara_iena_connexion
$mo_user_group_id = $mo_user_groups[0][0]; // first groupment, first group
$mo_group_name = groups_get_group_name($mo_user_group_id);
+ $course_name=block_mahara_iena_getCourseName($COURSE->shortname);
+
+ var_dump($course_name);
$group = new stdClass();
- $group->name = $COURSE->shortname . " – " . $mo_group_name;
- $group->description = get_string('course_group', 'block_mahara_iena') . " " . $COURSE->shortname . " – " . $mo_group_name;
+ $group->name = get_string('course_group', 'block_mahara_iena') . " " . $course_name . " – " . $mo_group_name;
+ $group->description = get_string('course_group', 'block_mahara_iena') . " " . $course_name . " – " . $mo_group_name;
$group->grouptype = 'course';
$group->request = true;
$group->public = false;
@@ -276,9 +279,11 @@ class block_mahara_iena_connexion
// $mo_group_name = groups_get_group_name($mo_user_group_id);
$mo_group_name = $mo_group->name;
+ $course_name=block_mahara_iena_getCourseName($COURSE->shortname);
+
$group = new stdClass();
- $group->name = $COURSE->shortname . " – " . $mo_group_name;
- $group->description = get_string('course_group', 'block_mahara_iena') . " " . $COURSE->shortname . " – " . $mo_group_name;
+ $group->name = get_string('course_group', 'block_mahara_iena') . " " . $course_name . " – " . $mo_group_name;
+ $group->description = get_string('course_group', 'block_mahara_iena') . " " . $course_name . " – " . $mo_group_name;
$group->grouptype = 'course';
$group->request = true;
$group->public = false;
@@ -335,9 +340,11 @@ class block_mahara_iena_connexion
$mo_user_group_id = $mo_group_id;
$mo_group_name = groups_get_group_name($mo_user_group_id);
+ $course_name=block_mahara_iena_getCourseName($COURSE->shortname);
+
$group = new stdClass();
- $group->name = $COURSE->shortname . " – " . $mo_group_name;
- $group->description = get_string('course_group', 'block_mahara_iena') . " " . $COURSE->shortname . " – " . $mo_group_name;
+ $group->name = get_string('course_group', 'block_mahara_iena') . " " . $course_name . " – " . $mo_group_name;
+ $group->description = get_string('course_group', 'block_mahara_iena') . " " . $course_name . " – " . $mo_group_name;
$group->grouptype = 'course';
$group->request = true;
$group->public = false;
@@ -389,7 +396,6 @@ class block_mahara_iena_connexion
-
}
diff --git a/lib.php b/lib.php
new file mode 100644
index 0000000..7faede3
--- /dev/null
+++ b/lib.php
@@ -0,0 +1,19 @@
+<?php
+function block_mahara_iena_isValidTimeStamp($timestamp)
+{
+ return ((string) (int) $timestamp === $timestamp)
+ && ($timestamp <= PHP_INT_MAX)
+ && ($timestamp >= ~PHP_INT_MAX);
+}
+
+function block_mahara_iena_getCourseName($coursename){
+ $course_name=$coursename;
+ $isTimeStamp=substr($coursename, -1, 11);
+ if(block_mahara_iena_isValidTimeStamp($isTimeStamp)){
+ $course_name=substr($coursename, -11);
+ }
+ return $course_name;
+
+}
+
+?>
\ No newline at end of file
diff --git a/mahara_iena.php b/mahara_iena.php
index a4be3de..8d5abb4 100644
--- a/mahara_iena.php
+++ b/mahara_iena.php
@@ -75,14 +75,16 @@ if (count($students) == 0) {
'role' => "admin",
));
}
+ $course_name=block_mahara_iena_getCourseName($COURSE->shortname);
+
//All params used for mahara_group_create_groups her we can add/change some lines
$params = array (
'groups' =>
array (
0 =>
array (
- 'name' => $COURSE->shortname,
- 'description' => get_string('course_group', 'block_mahara_iena') . " " . $COURSE->shortname,
+ 'name' => $course_name,
+ 'description' => get_string('course_group', 'block_mahara_iena') . " " . $course_name,
'grouptype' => 'course',
'request' => true,
'public' => false,
diff --git a/mahara_iena_groups.php b/mahara_iena_groups.php
index 3de9818..d4f87a1 100644
--- a/mahara_iena_groups.php
+++ b/mahara_iena_groups.php
@@ -30,12 +30,7 @@ $connexion = new block_mahara_iena_connexion($CFG->wstoken,$CFG->base_mahara);
$course_ctx = context_course::instance($course->id);
$students = get_enrolled_users($course_ctx);
-function isValidTimeStamp($timestamp)
-{
- return ((string) (int) $timestamp === $timestamp)
- && ($timestamp <= PHP_INT_MAX)
- && ($timestamp >= ~PHP_INT_MAX);
-}
+
if (count($students) == 0) {
@@ -79,12 +74,7 @@ if (count($students) == 0) {
continue;
}
- $course_name=$COURSE_shortname;
- $isTimeStamp=substr($COURSE->shortname, -1, 11);
- if($isTimeStamp){
- $course_name=substr($COURSE->shortname, -11);
- }
-
+ $course_name=block_mahara_iena_getCourseName($COURSE->shortname);
var_dump($course_name);
array_push($mahara_groups, array(
--
GitLab