yetangitu/Oinktube
1
0
Fork 0
mirror of https://github.com/DanielnetoDotCom/YouPHPTube synced 2025-10-03 09:49:28 +02:00
Code Issues Releases Wiki Activity

Put meet back

Browse source
This commit is contained in:
Daniel 2021-12-08 07:43:24 -03:00
parent 2ba1c0fd9e
commit a1f1ce429d
6 changed files with 63 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugin/Meet/Meet.php
View file

@ -191,7 +191,6 @@ Passcode: {password}
public function getPluginMenu() {
global $global;
//return '<a href="plugin/Meet/View/editor.php" class="btn btn-primary btn-sm btn-xs btn-block"><i class="fa fa-edit"></i> Edit</a>';
return '<button onclick="avideoModalIframe(webSiteRootURL +\'plugin/Meet/checkServers.php\');" class="btn btn-primary btn-sm btn-xs btn-block"><i class="fas fa-network-wired"></i> Check Servers</button>';
}

50
plugin/Meet/meet_log.php
View file

@ -20,31 +20,6 @@ $userCredentials = User::loginFromRequestToGet();
?>
<div class="row">
<div class="col-sm-5">
<div class="panel panel-default" id="roomConfiguration">
<div class="panel-heading">
<i class="fas fa-check-double"></i> <?php echo __("Last 10 Attends"); ?>
</div>
<div class="panel-body">
<ul class="list-group">
<?php
$count = 0;
$r = $_REQUEST;
$p = $_POST;
$r = $_REQUEST['rowCount'] = 10;
$p = $_POST['sort']['ml.created'] = 'DESC';
$list = Meet_join_log::getAllFromUser(User::getId());
$_REQUEST = $r;
$_POST = $p;
foreach ($list as $value) {
$count++;
echo '<li class="list-group-item">#' . $count . " - " . $value['topic'] . ' <span class="badge">' . $value['created'] . '</span><br><small class="text-muted">' . $value['user_agent'] . '</small></li>';
}
?>
</ul>
</div>
</div>
</div>
<div class="col-sm-7">
<div class="panel panel-default" id="roomConfiguration">
<div class="panel-heading">
@ -71,6 +46,31 @@ $userCredentials = User::loginFromRequestToGet();
</div>
</div>
</div>
<div class="col-sm-5">
<div class="panel panel-default" id="roomConfiguration">
<div class="panel-heading">
<i class="fas fa-check-double"></i> <?php echo __("Last 10 Attends"); ?>
</div>
<div class="panel-body">
<ul class="list-group">
<?php
$count = 0;
$r = $_REQUEST;
$p = $_POST;
$r = $_REQUEST['rowCount'] = 10;
$p = $_POST['sort']['ml.created'] = 'DESC';
$list = Meet_join_log::getAllFromUser(User::getId());
$_REQUEST = $r;
$_POST = $p;
foreach ($list as $value) {
$count++;
echo '<li class="list-group-item">#' . $count . " - " . $value['topic'] . ' <span class="badge">' . $value['created'] . '</span><br><small class="text-muted">' . $value['user_agent'] . '</small></li>';
}
?>
</ul>
</div>
</div>
</div>
</div>
<script>

16
plugin/Meet/meet_manager.php
View file

@ -20,7 +20,7 @@ $userCredentials = User::loginFromRequestToGet();
?>
<div class="row">
<div class="col-sm-5">
<div class="col-sm-3">
<div class="panel panel-default" id="roomConfiguration">
<div class="panel-heading">
<i class="fas fa-plus"></i> <?php echo __("Create Room"); ?>
@ -29,24 +29,24 @@ $userCredentials = User::loginFromRequestToGet();
<form id="formMeetManager">
<input type="hidden" id="meet_schedule_id" name="id" value="0">
<div class="form-group col-sm-6">
<div class="form-group">
<label for="RoomTopic"><?php echo __("Meet Topic"); ?>:</label>
<input type="text" id="RoomTopic" name="RoomTopic" class="form-control input-sm" placeholder="<?php echo __("Meet Topic"); ?>">
</div>
<div class="form-group col-sm-6">
<div class="form-group">
<label for="RoomPasswordNew"><?php echo __("Meet Password"); ?>:</label>
<?php
getInputPassword("RoomPasswordNew");
?>
</div>
<div class="form-group col-sm-6 hidden">
<div class="form-group hidden">
<label for="live_streamNew"><?php echo __("Auto Transmit Live"); ?>:</label>
<select class="form-control input-sm" name="live_stream" id="live_streamNew">
<option value="0"><?php echo __("No"); ?></option>
<option value="1"><?php echo __("Yes"); ?></option>
</select>
</div>
<div class="form-group col-sm-6">
<div class="form-group">
<label for="publicNew"><?php echo __("Public"); ?>/<?php echo __("Private"); ?>:</label>
<select class="form-control input-sm" name="public" id="publicNew">
<option value="2"><?php echo __("Public"); ?></option>
@ -70,7 +70,7 @@ $userCredentials = User::loginFromRequestToGet();
?>
</div>
</div>
<div class="form-group col-sm-6">
<div class="form-group">
<label for="whenNew"><?php echo __("When"); ?>:</label>
<select class="form-control input-sm" name="when" id="whenNew">
<option value="1"><?php echo __("Now"); ?></option>
@ -83,7 +83,7 @@ $userCredentials = User::loginFromRequestToGet();
</div>
<div class="clearfix"></div>
<div class="form-group col-sm-12">
<div class="form-group">
<div class="btn-group justified">
<span class="btn btn-success" id="newMeet_scheduleLink" onclick="clearMeetForm(true)"><i class="fas fa-plus"></i> <?php echo __("New"); ?></span>
<button class="btn btn-primary" type="submit"><i class="fas fa-save"></i> <?php echo __("Save"); ?></button>
@ -95,7 +95,7 @@ $userCredentials = User::loginFromRequestToGet();
</div>
</div>
</div>
<div class="col-sm-7">
<div class="col-sm-9">
<div class="panel panel-default" id="scheduleList" >
<div class="panel-heading">
<i class="far fa-calendar-alt"></i> <?php echo __("Schedule"); ?>

37
plugin/Meet/meet_scheduled.php
View file

@ -32,7 +32,7 @@ if (!User::canCreateMeet()) {
<?php
if ($manageMeetings) {
?>
<button class="btn btn-danger btn-xs deleteSelectedMeet<?php echo $meet_scheduled, $manageMeetings; ?> disabled" data-toggle="tooltip" title="<?php echo __("Delete All Selected"); ?>">
<button class="btn btn-danger deleteSelectedMeet<?php echo $meet_scheduled, $manageMeetings; ?> disabled" data-toggle="tooltip" title="<?php echo __("Delete All Selected"); ?>">
<i class="fas fa-trash"></i>
</button>
<?php
@ -40,7 +40,7 @@ if (!User::canCreateMeet()) {
?>
</th>
<th><?php echo __("Topic"); ?></th>
<th><?php echo __("Starts"); ?></th>
<th class="hidden-sm hidden-xs"><?php echo __("Starts"); ?></th>
<th><?php echo __("Starts In"); ?></th>
<th><?php echo __("Owner"); ?></th>
<th></th>
@ -52,7 +52,7 @@ if (!User::canCreateMeet()) {
<?php
if ($manageMeetings) {
?>
<button class="btn btn-danger btn-xs deleteSelectedMeet<?php echo $meet_scheduled, $manageMeetings; ?> disabled" data-toggle="tooltip" title="<?php echo __("Delete All Selected"); ?>">
<button class="btn btn-danger deleteSelectedMeet<?php echo $meet_scheduled, $manageMeetings; ?> disabled" data-toggle="tooltip" title="<?php echo __("Delete All Selected"); ?>">
<i class="fas fa-trash"></i>
</button>
<?php
@ -60,7 +60,7 @@ if (!User::canCreateMeet()) {
?>
</th>
<th><?php echo __("Topic"); ?></th>
<th><?php echo __("Starts"); ?></th>
<th class="hidden-sm hidden-xs"><?php echo __("Starts"); ?></th>
<th><?php echo __("Starts In"); ?></th>
<th><?php echo __("Owner"); ?></th>
<th></th>
@ -68,23 +68,25 @@ if (!User::canCreateMeet()) {
</tfoot>
</table>
<div id="Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?>btnModelLinksJoinOnly" style="display:none;">
<div class="btn-group pull-right">
<?php
if ($meet_scheduled == "today" || $meet_scheduled == "upcoming") {
if ($meet_scheduled == "today") {
?>
<button href="" class="go_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-success btn-xs"
<button href="" class="go_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-success btn-block"
data-toggle="tooltip" title="<?php echo __("Join"); ?>">
<i class="fa fa-check"></i>
</button>
<?php
}
?>
<button href="" class="copyInvitation_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-default btn-xs"
<div class="btn-group btn-group-justified">
<?php
if ($meet_scheduled == "today" || $meet_scheduled == "upcoming") {
?>
<button href="" class="copyInvitation_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-default"
data-toggle="tooltip" title="<?php echo __("Copy Invitation"); ?>">
<i class="fa fa-copy"></i>
</button>
<button href="" class="copyLink_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-default btn-xs"
<button href="" class="copyLink_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-default"
data-toggle="tooltip" title="<?php echo __("Copy Link"); ?>">
<i class="fa fa-link"></i>
</button>
@ -96,23 +98,25 @@ if (!User::canCreateMeet()) {
</div>
</div>
<div id="Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?>btnModelLinks" style="display:none;">
<div class="btn-group pull-right">
<?php
if ($meet_scheduled == "today") {
?>
<button href="" class="go_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-success btn-xs"
<button href="" class="go_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-success btn-block"
data-toggle="tooltip" title="<?php echo __("Join"); ?>">
<i class="fa fa-check"></i>
</button>
<?php
}
?>
<div class="btn-group btn-group-justified">
<?php
if ($meet_scheduled == "today" || $meet_scheduled == "upcoming") {
?>
<button href="" class="copyInvitation_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-default btn-xs"
<button href="" class="copyInvitation_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-default"
data-toggle="tooltip" title="<?php echo __("Copy Invitation"); ?>">
<i class="fa fa-copy"></i>
</button>
<button href="" class="copyLink_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-default btn-xs"
<button href="" class="copyLink_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-default"
data-toggle="tooltip" title="<?php echo __("Copy Link"); ?>">
<i class="fa fa-link"></i>
</button>
@ -122,15 +126,15 @@ if (!User::canCreateMeet()) {
<?php
if ($manageMeetings) {
?>
<button href="" class="log_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-primary btn-xs"
<button href="" class="log_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-primary"
data-toggle="tooltip" title="<?php echo __("Meet Log"); ?>">
<i class="fas fa-info-circle"></i>
</button>
<button href="" class="edit_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-default btn-xs"
<button href="" class="edit_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-default"
data-toggle="tooltip" title="<?php echo __("Edit"); ?>">
<i class="fa fa-edit"></i>
</button>
<button href="" class="delete_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-danger btn-xs"
<button href="" class="delete_Meet_schedule2<?php echo $meet_scheduled, $manageMeetings; ?> btn btn-danger"
data-toggle="tooltip" title="<?php echo __("Delete"); ?>">
<i class="fa fa-trash"></i>
</button>
@ -180,6 +184,7 @@ if (!User::canCreateMeet()) {
{"data": "topic"},
{
"data": "starts",
className:"hidden-xs hidden-sm",
"render": function (data, type, row) {
return row.starts_timezone;
}

2
view/include/navbar.php
View file

@ -77,7 +77,7 @@ if (!$includeDefaultNavBar) {
if (!empty($_GET['avideoIframe'])) { // comes from avideoModalIframe(url) javascript
?>
<style>body{padding: 0;}#mainFooter{display: none !important;}</style>
<style>body, body > div.container-fluid > div.panel {padding: 0; margin: 0;}#mainFooter{display: none !important;}</style>
<?php
return false;
}

5
view/js/script.js
View file

@ -626,6 +626,11 @@ function nl2br(str, is_xhtml) {
return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + breakTag + '$2');
}
function inIframe() {
var url = new URL(location.href);
var avideoIframe = url.searchParams.get("avideoIframe");
if(avideoIframe && avideoIframe !== 0){
return true;
}
try {
return window.self !== window.top;
} catch (e) {