Skip to content

Commit 84422f7

Browse files
satyammangroliyasatyammangroliya
authored
Revert "Release 10 stable"
1 parent f8ed8f5 commit 84422f7

File tree

7 files changed

+41
-88
lines changed

7 files changed

+41
-88
lines changed

‎README.md‎

100755100644
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ It is assumed you already have a ILIAS Intallation [up and running](https://docu
2222

2323
# Installation
2424

25-
### ILIAS 5.4, 6.x, 7.x, 8.x, 9.x, 10.x
25+
### ILIAS 5.4, 6.x, 7.x, 8.x, 9.x
2626

2727
On your ILIAS Server:
2828

@@ -62,7 +62,6 @@ Tested with ILIAS
6262
- 7.x
6363
- 8.x
6464
- 9.x
65-
- 10.x
6665

6766

6867

‎classes/class.ilBigBlueButtonPlugin.php‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,4 @@ protected function uninstallCustom(): void
2424
$ilDB->dropTable('rep_robj_xbbb_conf');
2525

2626
}
27-
28-
// public static function _getIcon(string $a_type): string
29-
// {
30-
// return "Customizing/plugins/Repository/RepositoryObject/BigBlueButton/templates/images/icon_" . $a_type . ".svg";
31-
// }
32-
33-
public static function _getIcon(string $a_type): string
34-
{
35-
$plugin_folder = "BigBlueButton";
36-
37-
return "Customizing/global/plugins/Services/Repository/RepositoryObject/" . $plugin_folder
38-
. "/templates/images/icon_" . $a_type . ".svg";
39-
}
40-
41-
4227
}

‎classes/class.ilObjBigBlueButtonGUI.php‎

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ class ilObjBigBlueButtonGUI extends ilObjectPluginGUI
5353
*/
5454
protected function afterConstructor(): void
5555
{
56-
// $this->tpl->addCss("./public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton/templates/bbb.css");
57-
$this->tpl->addCss($this->getPlugin()->getDirectory() . '/templates/bbb.css');
56+
$this->tpl->addCss("./Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton/templates/bbb.css");
5857
}
5958

6059
/**
@@ -167,9 +166,7 @@ public function initPropertiesForm()
167166
{
168167
global $ilCtrl;
169168

170-
include_once ILIAS_ABSOLUTE_PATH . "/components/ILIAS/Form/classes/class.ilPropertyFormGUI.php";
171-
172-
169+
include_once("Services/Form/classes/class.ilPropertyFormGUI.php");
173170
$this->form = new ilPropertyFormGUI();
174171

175172
// title
@@ -312,10 +309,11 @@ public function showContent()
312309
$available_sessions = $BBBHelper->getMaximumSessionsAvailable();
313310
//$BBBHelper->getMeetings();
314311

315-
$client_js = new ilTemplate("../client.js", true, true, "public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton");
312+
$client_js = new ilTemplate("./Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton/templates/client.js", true, true);
316313

317314
if ($isModerator) {
318-
$my_tpl = new ilTemplate("../tpl.BigBlueButtonModeratorClient.html", true, true, "public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton");
315+
$my_tpl = new ilTemplate("./Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton/templates/tpl.BigBlueButtonModeratorClient.html", true, true);
316+
319317
$my_tpl->setVariable("CMD_END_CLASS", "cmd[endClass]");
320318
$my_tpl->setVariable("END_CLASS", $this->txt('end_bbb_class'));
321319
$my_tpl->setVariable("FORMACTION", $this->ctrl->getFormAction($this));
@@ -333,25 +331,13 @@ public function showContent()
333331
$my_tpl->setVariable("startClass", $this->txt("start_class"));
334332
$my_tpl->setVariable("endClass", $this->txt("end_class"));
335333
$my_tpl->setVariable("endClassComment", $this->txt("end_class_comment"));
336-
337-
global $DIC; // Get global ILIAS dependency injection container
338-
339-
// Log the values of guest access settings
340-
$data = [
341-
"Guest Global Allowed" => $this->object->isGuestGlabalAllowed(),
342-
"Guest Link Allowed" => $this->object->isGuestLinkAllowed(),
343-
];
344-
345-
$DIC->logger()->root()->dump($data); // Logs data in ILIAS 10
346-
347-
if ($this->object->isGuestGlabalAllowed() && $this->object->isGuestLinkAllowed()) {
348-
$my_tpl->setCurrentBlock("guestlink_block");
334+
if($this->object->isGuestGlabalAllowed() && $this->object->isGuestLinkAllowed()){
349335
$my_tpl->setVariable("GUEST_INVITE_INFO", $this->txt("guest_invite_info"));
350336
$my_tpl->setVariable("GUEST_INVITE_URL", $BBBHelper->getInviteUrl());
351-
$my_tpl->parseCurrentBlock();
337+
}else{
338+
$my_tpl->setVariable("HIDE_GUESTLINK", "hide");
352339
}
353-
354-
340+
355341
if ($values["choose_recording"]){
356342
$my_tpl->setVariable("recordings", $this->buildRecordingUI());
357343
$my_tpl->setVariable("Headline_Recordings", $this->txt("Headline_Recordings"));
@@ -368,7 +354,8 @@ public function showContent()
368354

369355
$bbbURL=$BBBHelper->joinURLModerator($this->object);
370356
} else {
371-
$my_tpl = new ilTemplate("../tpl.BigBlueButtonClient.html", true, true, "public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton");
357+
$my_tpl = new ilTemplate("./Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton/templates/tpl.BigBlueButtonClient.html", true, true);
358+
372359
$my_tpl->setVariable("classNotStartedText", $this->txt("class_not_started_yet"));
373360

374361
$bbbURL=$BBBHelper->joinURL($this->object);
@@ -401,7 +388,7 @@ private function buildRecordingUI()
401388
"tpl.BigBlueButtonRecordTable.html",
402389
true,
403390
true,
404-
"public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton"
391+
"Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton"
405392
);
406393
$table_content = [];
407394
$recordcount=0;
@@ -413,7 +400,7 @@ private function buildRecordingUI()
413400
$table_row_template = new ilTemplate("tpl.BigBlueButtonRecordTableRow.html",
414401
true,
415402
true,
416-
"public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton");
403+
"Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton");
417404
$table_row_template->setVariable("Date",date("d.m.Y H:i", substr ($recording->startTime,0,10)));
418405
$seconds = round(($recording->endTime - $recording->startTime)/1000);
419406
$table_row_template->setVariable("Duration", $this->formatTimeDiff( $seconds ));
@@ -423,7 +410,7 @@ private function buildRecordingUI()
423410
$table_link_template = new ilTemplate("tpl.BigBlueButtonRecordTableLink.html",
424411
true,
425412
true,
426-
"public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton");
413+
"Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton");
427414
$table_link_template->setVariable("URL",$format->url);
428415
if($format->type=="presentation" && $this->object->isDownloadAllowed() ){
429416
$node = '<a href="'.$BBBHelper->getVideoDownloadStreamUrl($format->url).'" download>' .$this->txt("DownloadText") . '</a>';
@@ -487,7 +474,7 @@ public function endClass()
487474

488475
//$this->object->incSequence();
489476

490-
$my_tpl = new ilTemplate("../tpl.BigBlueButtonModeratorMeetingEnded.html", true, true, "public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton");
477+
$my_tpl = new ilTemplate("./Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton/templates/tpl.BigBlueButtonModeratorMeetingEnded.html", true, true);
491478
$my_tpl->setVariable("classEnded", $this->txt("class_ended"));
492479
$tpl->setContent($my_tpl->get());
493480
$this->showContent();
@@ -505,7 +492,7 @@ public function startClass()
505492

506493
$BBBHelper->createMeeting($this->object, isset($_POST["recordmeeting"]));
507494

508-
$my_tpl = new ilTemplate("../tpl.BigBlueButtonModeratorMeetingCreated.html", true, true, "public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton");
495+
$my_tpl = new ilTemplate("./Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton/templates/tpl.BigBlueButtonModeratorMeetingCreated.html", true, true);
509496

510497
$bbbURL=$BBBHelper->joinURLModerator($this->object);
511498

‎guest.php‎

100755100644
Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,19 @@
22
// enable display errors only on dev systems
33
ini_set('display_errors', 1);
44

5-
6-
7-
85
use BigBlueButton\Enum\Role;
96
use ILIAS\DI\Container;
107

11-
// Load Composer Autoload First
12-
13-
14-
// Now Load ILIAS Container
15-
//require_once dirname(__DIR__, 6) . "/components/ILIAS/DI/src/Container.php";
16-
17-
// Go up 6 levels: from guest.php to ILIAS root
18-
$directory = strstr($_SERVER['SCRIPT_FILENAME'], '/public/Customizing', true);
19-
if (empty($directory)) {
20-
$directory = getcwd();
8+
$directory = strstr($_SERVER['SCRIPT_FILENAME'], 'Customizing', true);
9+
if(empty($directory))
10+
{
11+
$directory = getcwd();
2112
}
2213
chdir($directory);
2314

24-
25-
require_once("./vendor/composer/vendor/autoload.php");
26-
require_once('./components/ILIAS/Context/classes/class.ilContext.php');
27-
require_once('./components/ILIAS/Init/classes/class.ilInitialisation.php');
28-
require_once('./components/ILIAS/Language/classes/class.ilLanguage.php');
15+
require_once('./Services/Context/classes/class.ilContext.php');
16+
require_once("./Services/Init/classes/class.ilInitialisation.php");
17+
require_once('./Services/Language/classes/class.ilLanguage.php');
2918

3019

3120
/**
@@ -40,7 +29,7 @@ class GuestLink
4029
{
4130
const DEFAULT_LANG = 'de';
4231

43-
const PLUGIN_DIR = 'public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton';
32+
const PLUGIN_DIR = 'Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton';
4433

4534
/** @var GuestLink|null $instance */
4635
static private $instance;
@@ -186,13 +175,10 @@ private function setHtmlDocument()
186175
{
187176
$http_base = ILIAS_HTTP_PATH;
188177
if (strpos($http_base,'/m/')) {
189-
$http_base = strstr($http_base,'/m/',true).'/public/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton';
178+
$http_base = strstr($http_base,'/m/',true).'/Customizing/global/plugins/Services/Repository/RepositoryObject/BigBlueButton';
190179
}
191180

192-
$tpl = new HTML_Template_ITX();
193-
$tpl->loadTemplatefile(__DIR__ . '/templates/tpl.guest.html', true, true);
194-
$this->htmlTpl = $tpl;
195-
181+
$this->htmlTpl = new ilTemplate( dirname(__FILE__) . '/' . 'templates/tpl.guest.html', true, true);
196182
$this->htmlTpl->setVariable('USER_LANG', $this->isoLangCode[$this->userLang]);
197183
$this->htmlTpl->setVariable('HTTP_BASE', $http_base);
198184
$this->htmlTpl->setVariable('MEETING_TITLE', $this->getMeetingTitle());// . ' - ' . $this->getLangVar('big_blue_button'));
@@ -306,12 +292,7 @@ private function txt(string $value): string
306292
private function setUserLangBySvrParam(): void
307293
{
308294
if( isset($this->dic->http()->request()->getServerParams()['HTTP_ACCEPT_LANGUAGE']) && strlen($this->dic->http()->request()->getServerParams()['HTTP_ACCEPT_LANGUAGE']) >= 2 ) {
309-
$lang = substr($this->dic->http()->request()->getServerParams()['HTTP_ACCEPT_LANGUAGE'], 0, 2);
310-
if (in_array($lang, ilLanguage::_getInstalledLanguages())) {
311-
$this->userLang = $lang;
312-
}else {
313-
$this->userLang = ilSession::get("lang");
314-
}
295+
$this->userLang = substr($this->dic->http()->request()->getServerParams()['HTTP_ACCEPT_LANGUAGE'], 0, 2);
315296
}
316297
}
317298

@@ -393,8 +374,7 @@ private function __construct()
393374
if($available_sessions['max_sessions'] || ( key_exists($this->pluginObject->getBBBId(), $available_sessions['meetings']) && $available_sessions['meetings'][$this->pluginObject->getBBBId()]['userlimit'])){
394375
$this->errState['userLimit'] = true;
395376
}
396-
}
397-
if( !$this->errState['displayname'] ) {
377+
}else if( !$this->errState['displayname'] ) {
398378
$this->bbb = new ilBBB($this->pluginConfig->getSvrSalt(), $this->pluginConfig->getSvrPublicUrl());
399379
$this->attendeePwd = $this->pluginObject->getAttendeePwd();
400380
$this->setMeetingId();
@@ -426,4 +406,10 @@ public function __toString(): string
426406

427407
}
428408

429-
echo GuestLink::init();
409+
echo GuestLink::init();
410+
411+
412+
413+
414+
415+

‎plugin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// ilias min and max version; must always reflect the versions that should
1010
// run with the plugin
1111
$ilias_min_version = "8.0";
12-
$ilias_max_version = "10.999";
12+
$ilias_max_version = "9.999";
1313

1414
// optional, but useful: Add one or more responsible persons and a contact email
1515
$responsible = "Minervis GmbH";

‎templates/bbb.css‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,3 @@
2626
color: red;
2727
font-weight: 700;
2828
}
29-
30-
31-
.ilInfoScreenSec.form-horizontal.d-none{
32-
display: none !important;
33-
}

‎templates/tpl.BigBlueButtonModeratorClient.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,18 @@
3030
{maxNumberofSessionsExceededText}
3131
</div>
3232

33-
<!-- BEGIN guestlink_block -->
34-
<div class="ilInfoScreenSec form-horizontal" id="infoscreen_section_2">
33+
<div class="ilInfoScreenSec form-horizontal {HIDE_GUESTLINK}" id="infoscreen_section_2">
3534
<h3 class="ilHeader">{GUEST_INVITE_INFO}&nbsp;</h3>
3635
<div class="form-group">
36+
<!-- <div class="il_InfoScreenProperty control-label col-xs-1">{userInviteInfo}</div> -->
3737
<div class="il_InfoScreenPropertyValue col-xs-6">
3838
<div class="ilPermalinkContainer input-group">
3939
<input class="form-control" readonly="readonly" id="userInviteUrl" type="text" value="{GUEST_INVITE_URL}" onclick="return false;">
4040
<span class="input-group-btn">
4141
<div class="btn-group">
42+
<!-- Important: The next a-tag had a this.blur(); in the onclick event before. Please do not add it again, see bug #8723 -->
4243
<button type="button" class="btn btn-default" id="copyUserInviteUrl">
44+
<span></span>
4345
<span class="sr-only">Copy to clipboard</span>
4446
<span class="glyphicon glyphicon-copy"></span>
4547
</button>
@@ -49,7 +51,6 @@ <h3 class="ilHeader">{GUEST_INVITE_INFO}&nbsp;</h3>
4951
</div>
5052
</div>
5153
</div>
52-
<!-- END guestlink_block -->
5354
<form id="deleteRecording" action="{FORMACTION3}" method="post">
5455
<input id="deleteRecordingInput" class="submit" type="submit" name="{CMD_DELETE_RECORDING}" value="{DELETE_RECORDING}" >
5556
<input type="text" id="recordID" name="recordID" />

0 commit comments

Comments
 (0)