Skip to content

Update for Ilch 2 final #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hhunderter wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update for Ilch 2 final #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5bd99dc
Update for Ilch 2 final
blackcoder87 Jul 20, 2018
f50f467
Fix some errors
blackcoder87 Jul 20, 2018
84432c0
Fix error introduced by using the cache
blackcoder87 Jul 20, 2018
c64bfa5
alternative fix for previous issue
blackcoder87 Jul 21, 2018
5233504
Update config.php
Apr 9, 2021
9246c18
Fix Undefined offset
Apr 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
application/modules/voiceserver/static/img/ts3/server/
nbproject/
nbproject/
application/modules/voiceserver/cache/
60 changes: 31 additions & 29 deletions application/modules/voiceserver/boxes/views/voiceserver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
<?php $voiceServer = $this->get('voiceServer'); ?>

<?php function getVoiceserverBoxView($items) { ?>
<?php $last_channel = end((array_keys($items))); ?>
<?php foreach ($items as $key => $item): ?>
<li <?php if($last_channel == $key): ?>class="last"<?php endif; ?> >
<a href="<?=$item['link'] ?>" title="<?=$item['topic'] ?>" >
<?=$item['icon'] . $item['name'] ?>
<?php if (isset($item['flags'])): ?>
<div class="voiceSrvFlags"><?=$item['flags'] ?></div>
<?php if(is_array($items) && count($items) > 0): ?>
<?php $last_channel = array_keys($items)[count($items)-1]; ?>
<?php foreach ($items as $key => $item): ?>
<li <?php if($last_channel == $key): ?>class="last"<?php endif; ?> >
<a href="<?=$item['link'] ?>" title="<?=$item['topic'] ?>" >
<?=$item['icon'] . $item['name'] ?>
<?php if (isset($item['flags'])): ?>
<div class="voiceSrvFlags"><?=$item['flags'] ?></div>
<?php endif; ?>
</a>
<?php if (isset($item['users'])): ?>
<ul>
<?php $last_user = array_keys($item['users'])[count($item['users'])-1]; ?>
<?php foreach ($item['users'] as $u_key => $user): ?>
<li <?php if (!isset($item['children']) && $last_user == $u_key): ?>class="last"<?php endif; ?> >
<?=$user['icon'] . $user['name'] ?>
<?php if (isset($user['flags'])): ?>
<div class="voiceSrvFlags"><?=$user['flags'] ?></div>
<?php endif; ?>
</li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
<?php if (isset($item['children'])): ?>
<ul>
<?php getVoiceserverBoxView($item['children']); ?>
</ul>
<?php endif; ?>
</a>
<?php if (isset($item['users'])): ?>
<ul>
<?php $last_user = end((array_keys($item['users']))); ?>
<?php foreach ($item['users'] as $u_key => $user): ?>
<li <?php if (!isset($item['children']) && $last_user == $u_key): ?>class="last"<?php endif; ?> >
<?=$user['icon'] . $user['name'] ?>
<?php if (isset($user['flags'])): ?>
<div class="voiceSrvFlags"><?=$user['flags'] ?></div>
<?php endif; ?>
</li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
<?php if (isset($item['children'])): ?>
<ul>
<?php getVoiceserverBoxView($item['children']); ?>
</ul>
<?php endif; ?>
</li>
<?php endforeach; ?>
</li>
<?php endforeach; ?>
<?php endif; ?>
<?php }; ?>

<?php
Expand Down Expand Up @@ -87,7 +89,7 @@
refreshVoice();
function refreshVoice() {
$('#voiceserver').load('<?=$this->getUrl(['module' => 'voiceserver', 'controller' => 'ajax','action' => 'refreshVoice']); ?>');
};
}
}, <?=$voiceServer['Refresh']*1000 ?> );
});
</script>
Expand Down
Loading