aandrieux
/
TS-Website
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1 from Wruczek/1.0

Browse Source 
test
pull/76/head
Robin 8 years ago committed by GitHub
parent 2839e64e23 24c321a26f
commit 2316aea424
11 changed files with 154 additions and 45 deletions
Show Stats Download Patch File Download Diff File

160
.gitignore vendored
Unescape View File

@ -5,34 +5,26 @@ admin/
cache/
!/cache/.htaccess
# PhpStorm
.idea/
*.iws
.idea_modules/
# Heroku specific entries
vendor/
.env
# Created by https://www.gitignore.io/api/windows,osx,linux
### Windows ###
# Windows image file caches
Thumbs.db
ehthumbs.db
# Created by https://www.gitignore.io/api/osx,linux,windows,phpstorm,sublimetext
# Folder config file
Desktop.ini
### Linux ###
*~
# Recycle Bin used on file shares
$RECYCLE.BIN/
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# Windows Installer files
*.cab
*.msi
*.msm
*.msp
# KDE directory preferences
.directory
# Windows shortcuts
*.lnk
# Linux trash folder which might appear on any partition or disk
.Trash-*
# .nfs files are created when an open file is removed but is still being accessed
.nfs*
### OSX ###
*.DS_Store
@ -42,7 +34,6 @@ $RECYCLE.BIN/
# Icon must end with two \r
Icon
# Thumbnails
._*
@ -62,15 +53,122 @@ Network Trash Folder
Temporary Items
.apdisk
### PhpStorm ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
### Linux ###
*~
# User-specific stuff:
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
# KDE directory preferences
.directory
# Gradle:
.idea/**/gradle.xml
.idea/**/libraries
# Linux trash folder which might appear on any partition or disk
.Trash-*
# CMake
cmake-build-debug/
# Mongo Explorer plugin:
.idea/**/mongoSettings.xml
## File-based project format:
*.iws
## Plugin-specific files:
# IntelliJ
/out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# Ruby plugin and RubyMine
/.rakeTasks
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
### PhpStorm Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr
# Sonarlint plugin
.idea/sonarlint
### SublimeText ###
# cache files for sublime text
*.tmlanguage.cache
*.tmPreferences.cache
*.stTheme.cache
# workspace files are user-specific
*.sublime-workspace
# project files should be checked into the repository, unless a significant
# proportion of contributors will probably not be using SublimeText
# *.sublime-project
# sftp configuration file
sftp-config.json
# Package control specific files
Package Control.last-run
Package Control.ca-list
Package Control.ca-bundle
Package Control.system-ca-bundle
Package Control.cache/
Package Control.ca-certs/
Package Control.merged-ca-bundle
Package Control.user-ca-bundle
oscrypto-ca-bundle.crt
bh_unicode_properties.cache
# Sublime-github package stores a github token in this file
# https://packagecontrol.io/packages/sublime-github
GitHub.sublime-settings
### Windows ###
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db
# Folder config file
Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msm
*.msp
# Windows shortcuts
*.lnk
# End of https://www.gitignore.io/api/osx,linux,windows,phpstorm,sublimetext

2
.htaccess
Unescape View File

@ -1,4 +1,4 @@
# (c) 2015 - 2017 Wruczek <wruczekk@gmail.com>
# (c) 2015 - 2017 Wruczek <wruczekk@gmail.com> and Contributors
AddDefaultCharset UTF-8

2
LICENSE.md
Unescape View File

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2016 - 2017 Wruczek <wruczekk@gmail.com>
Copyright (c) 2016 - 2017 Wruczek <wruczekk@gmail.com> and Contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

6
bans.php
Unescape View File

@ -68,14 +68,14 @@ function getBanlist() {
$user = censorIP((string)$ban['ip']);
if (!empty($ban['lastnickname']))
$user = htmlentities((string)$ban['lastnickname']);
$user = htmlspecialchars((string)$ban['lastnickname']);
if (empty($user))
$user = "<i>Unknown</i>";
$reason = htmlentities((string)$ban['reason']);
$invokername = htmlentities((string)$ban['invokername']);
$reason = htmlspecialchars((string)$ban['reason']);
$invokername = htmlspecialchars((string)$ban['invokername']);
$duration = $ban['duration'];
$createdepoch = $ban['created'];
$expiresepoch = $ban['created'] + $duration;

6
composer.json
Unescape View File

@ -0,0 +1,6 @@
{
"require" : {
"php" : "^5.5",
"ext-mbstring": "*"
}
}

6
config/languages/lang.de.php
Unescape View File

@ -33,7 +33,7 @@ $lang["footer"]["background"] = "Hintergrund";
/************* Server status *************/
$lang["serverstatus"]["title"] = "Server Status";
$lang["serverstatus"]["address"] = "Addresse";
$lang["serverstatus"]["address"] = "Adresse";
$lang["serverstatus"]["loading"] = "Laden...";
$lang["serverstatus"]["online"] = "Online";
@ -57,7 +57,7 @@ $lang["adminlist"]["lastupdate"] = "Letzte Aktualisierung: {0}";
/************* Server viewer promo box (under adminlist and contact) *************/
$lang["svpb"]["title"] = "Server Viewer";
$lang["svpb"]["takealook"] = "Riskier 'n Blick &raquo;";
$lang["svpb"]["takealook"] = "Riskier einen Blick &raquo;";
/************************************/
@ -101,4 +101,4 @@ $lang["banlist"]["table"]["expires"] = "Läuft ab am";
$lang["rules"]["title"] = "Server Regeln";
$lang["rules"]["filenotfound"] = "Error: Die Datei <code>config/rules.md</code> wurde nicht gefunden!";
$lang["rules"]["readerror"] = "Fehler: nicht genügend Rechte um auf <code>config/rules.md</code> zuzugreifen!";
$lang["rules"]["readerror"] = "Fehler: Nicht genügend Rechte um auf <code>config/rules.md</code> zuzugreifen!";

6
config/rules.md
Unescape View File

@ -1,4 +1,8 @@
### Regulamin serwera
### Server Rules
In dieser Datei werden die Server Regeln eingetragen welche dann auf der Seite "rules.php" angezeigt werden. Zum Ändern muss einfach die Datei <code>rules.md</code> im Verzeichnis <code>config</code> verändert werden.
<br>
This is a dedicated file to keep your server rules. Its loaded and displayed on "rules.php" page. To change it, go to the <code>config</code> directory and edit file <code>rules.md</code>

3
css/style.css
Unescape View File

@ -31,7 +31,8 @@ p, a {
/* Force 16px icon size after TeamSpeak update 3.1.5 */
.ts3_viewer img, .adminlist img {
width: 16px
max-height: 16px;
max-width: 16px
}
/* ****** */

4
include/adminlist.php
Unescape View File

@ -63,11 +63,11 @@ function getAdminList() {
if($user["client_type"]) continue;
if (!$user) {
$offlineClients[] = '<p><span class="label label-primary iconspacer">' . htmlentities($userInfo['client_nickname']) . '</span><span class="label label-danger pull-right">' . translate($lang["adminlist"]["status"]["offline"]) . '</span></p>';
$offlineClients[] = '<p><span class="label label-primary iconspacer">' . htmlspecialchars($userInfo['client_nickname']) . '</span><span class="label label-danger pull-right">' . translate($lang["adminlist"]["status"]["offline"]) . '</span></p>';
continue;
}
$onlineClients[] = '<p><img src="lib/ts3phpframework/images/viewer/' . $user->getIcon() . '.png" alt="User status">' . '<span class="label label-primary">' . htmlentities($user) . '</span>' . ($user['client_away'] ? '<span class="label label-warning pull-right">' . translate($lang["adminlist"]["status"]["away"]) . '</span>' : '<span class="label label-success pull-right">' . translate($lang["adminlist"]["status"]["online"]) . '</span>') . '</p>';
$onlineClients[] = '<p><img src="lib/ts3phpframework/images/viewer/' . $user->getIcon() . '.png" alt="User status">' . '<span class="label label-primary">' . htmlspecialchars($user) . '</span>' . ($user['client_away'] ? '<span class="label label-warning pull-right">' . translate($lang["adminlist"]["status"]["away"]) . '</span>' : '<span class="label label-success pull-right">' . translate($lang["adminlist"]["status"]["online"]) . '</span>') . '</p>';
}
foreach (array_merge($onlineClients, $offlineClients) as $str)

2
include/footer.php
Unescape View File

@ -12,7 +12,7 @@
<ul class="list-inline">
<li> <!-- Please respect the amount of work we've put for free into this project and leave the authors in the footer. Thank you. -->
<p>
<a href="https://github.com/Wruczek/ts-website">ts-website</a> v 1.4.5 &mdash; &copy; <a href="https://wruczek.tech">Wruczek</a> 2016 - 2017
<a href="https://github.com/Wruczek/ts-website">ts-website</a> v 1.4.5 &mdash; &copy; <a href="https://wruczek.tech">Wruczek</a> and Contributors 2016 - 2017
</p>
<p>

2
include/header.php
Unescape View File

@ -16,7 +16,7 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="<?php echo $config["general"]["desc"]; ?>">
<meta name="author" content="Wruczek">
<meta name="author" content="Wruczek and Contributors">
<title><?php echo $config["general"]["title"] . $config["general"]["subtitle"]; ?></title>

Write Preview
Loading…
Cancel
Save