Added a usefull versions file and updated versions info

This commit is contained in:
WolverinDEV 2018-12-02 20:58:29 +01:00
parent 1086937b9b
commit 6d96a265bd
6 changed files with 47 additions and 4 deletions

View file

@ -365,6 +365,10 @@
echo "Generated!" . PHP_EOL;
}
{
exec("./scripts/git_index.sh sort-tag", $output, $state);
file_put_contents($environment . DIRECTORY_SEPARATOR . "version", $output);
}
if ($_SERVER["argv"][2] == "client") {
if(!chdir("client-api/environment")) {

26
scripts/git_index.sh Executable file
View file

@ -0,0 +1,26 @@
#!/usr/bin/env bash
response=$(git diff-index HEAD -- . ':!asm/libraries/' ':!package-lock.json' ':!vendor/')
if [ "$response" != "" ]; then
if [ "$1" == "sort-tag" ]; then
echo "0000000"
fi
if [ "$1" == "name" ]; then
echo "custom build"
fi
if [ "$1" == "file-name" ]; then
echo "custom"
fi
exit 1
else
if [ "$1" == "sort-tag" ]; then
echo "$(git rev-parse --short HEAD)"
fi
if [ "$1" == "name" ]; then
echo "$(git rev-parse --short HEAD)"
fi
if [ "$1" == "file-name" ]; then
echo "$(git rev-parse --short HEAD)"
fi
exit 0
fi

View file

@ -76,6 +76,11 @@
spawnProperty('forum_user_data', $_COOKIE[$GLOBALS["COOKIE_NAME_USER_DATA"]]);
spawnProperty('forum_user_sign', $_COOKIE[$GLOBALS["COOKIE_NAME_USER_SIGN"]]);
spawnProperty('forum_path', authPath());
$version = file_get_contents("./version");
if ($version === false)
$version = "unknown";
spawnProperty("version", $version);
?>
</x-properties>

View file

@ -344,12 +344,13 @@ class HandshakeHandler {
return;
}
const browser_name = (navigator.browserSpecs || {})["name"];
const git_version = settings.static_global("version", "unknown");
const browser_name = (navigator.browserSpecs || {})["name"] || " ";
let data = {
//TODO variables!
client_nickname: this.name ? this.name : this.identity.name(),
client_platform: navigator.platform,
client_version: browser_name ? browser_name + " (" + navigator.userAgent + ")" : navigator.userAgent,
client_platform: (browser_name ? browser_name + " " : "") + navigator.platform,
client_version: "TeaWeb " + git_version + " (" + navigator.userAgent + ")",
client_server_password: this.server_password,
client_browser_engine: navigator.product

View file

@ -57,7 +57,12 @@ namespace Modals {
tag.find(".connect_nickname").val(settings.static_global("connect_name", undefined));
tag.find(".connect_address").val(settings.static_global("connect_address", defaultHost));
tag.find(".connect_address").on("keyup", () => updateFields());
tag.find(".connect_address")
.on("keyup", () => updateFields())
.on('keydown', event => {
if(event.keyCode == JQuery.Key.Enter && !event.shiftKey)
tag.parents(".modal-content").find(".connect_connect_button").trigger('click');
});
tag.find(".connect_nickname").on("keyup", () => updateFields());
tag.find(".identity_select").on('change', function (this: HTMLSelectElement) {

2
todo.md Normal file
View file

@ -0,0 +1,2 @@
- channel encrypted within status bar (ref for override via server: encrypted: false (overridden by server: true))
- arrow channel select move