ShaYmez
/
FreeSTAR-Status-Engine
mirror of https://github.com/ShaYmez/FreeSTAR-Status-Engine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add some conflicts

This commit is contained in:
jhuesser 2018-06-13 10:44:02 +02:00 committed by Thomas Nilsen
parent 1172eeaf1b
commit ecaf5aa58b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
template.php
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
<?php
//This should later be translatable, maybe find a better solution?
//This is here for better generation of POT files :)
@ -72,12 +71,12 @@ class Template{
</ul>
</div>
<div class="navbar-collapse collapse navbar-right navbar-admin">
<ul class="nav navbar-nav">
<ul class="nav navbar-nav mr-auto">
<?php
$tg_user = getTelegramUserData();
if($tg_user !== false){
echo'<li><a href="?do=subscriptions">Subscriptions</a></li>';
echo '<li><a href="https://status.jhuesser.ch/index.php?subscriber_logout=1">Logout</a></li>';
echo '<li><a href="index.php?subscriber_logout=1">Logout</a></li>';
} else {
echo '<li><a href="#"><script async src="https://telegram.org/js/telegram-widget.js?4" data-telegram-login="jhuesserstatusbot" data-size="small" data-userpic="false" data-auth-url="https://status.jhuesser.ch/check.php" data-request-access="write"></script></a></li>';
}?>