Skip to content

Commit

Permalink
rebranding: resolve gramm (typo) -> grommunio
Browse files Browse the repository at this point in the history
  • Loading branch information
grammmike committed Jul 19, 2021
1 parent 4e7e8aa commit 02dd016
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion grommunio-sync-top.php
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ private function scrGetSize() {
* @return string
*/
private function getVersion() {
return GRAMMSYNC_VERSION;
return GROMMUNIOSYNC_VERSION;
}

/**
Expand Down
6 changes: 3 additions & 3 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
ZLog::Write(LOGLEVEL_DEBUG,"-------- Start");
ZLog::Write(LOGLEVEL_DEBUG,
sprintf("cmd='%s' devType='%s' devId='%s' getUser='%s' from='%s' version='%s' method='%s'",
Request::GetCommand(), Request::GetDeviceType(), Request::GetDeviceID(), Request::GetGETUser(), Request::GetRemoteAddr(), @constant('GRAMMSYNC_VERSION'), Request::GetMethod() ));
Request::GetCommand(), Request::GetDeviceType(), Request::GetDeviceID(), Request::GetGETUser(), Request::GetRemoteAddr(), @constant('GROMMUNIOSYNC_VERSION'), Request::GetMethod() ));

// always request the authorization header
if (! Request::HasAuthenticationInfo() || !Request::GetGETUser())
Expand Down Expand Up @@ -77,7 +77,7 @@
header(ZPush::GetServerHeader());

if (RequestProcessor::isUserAuthenticated()) {
header("X-Grommunio-Sync-Version: ". @constant('GRAMMSYNC_VERSION'));
header("X-Grommunio-Sync-Version: ". @constant('GROMMUNIOSYNC_VERSION'));
}

// announce the supported AS versions (if not already sent to device)
Expand Down Expand Up @@ -213,7 +213,7 @@
Request::GetCommand(), Utils::FormatBytes(memory_get_peak_usage(false)), Utils::FormatBytes(memory_get_peak_usage(true)),
number_format(microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"], 2),
Request::GetDeviceType(), Request::GetDeviceID(), Request::GetGETUser(), Request::GetRemoteAddr(),
RequestProcessor::GetWaitTime(), @constant('GRAMMSYNC_VERSION'), Request::GetMethod(), http_response_code() ));
RequestProcessor::GetWaitTime(), @constant('GROMMUNIOSYNC_VERSION'), Request::GetMethod(), http_response_code() ));

ZLog::Write(LOGLEVEL_DEBUG, "-------- End");

6 changes: 3 additions & 3 deletions version.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
* SPDX-FileCopyrightText: Copyright 2020 grommunio GmbH
*/

if (!defined("GRAMMSYNC_VERSION")) {
if (!defined("GROMMUNIOSYNC_VERSION")) {
$path = escapeshellarg(dirname(realpath($_SERVER['SCRIPT_FILENAME'])));
$branch = trim(exec("hash git 2>/dev/null && cd $path >/dev/null 2>&1 && git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e \"s/* \(.*\)/\\1/\""));
$version = exec("hash git 2>/dev/null && cd $path >/dev/null 2>&1 && git describe --always 2>/dev/null");
if ($branch && $version) {
define("GRAMMSYNC_VERSION", $branch .'-'. $version);
define("GROMMUNIOSYNC_VERSION", $branch .'-'. $version);
}
else {
define("GRAMMSYNC_VERSION", "GIT");
define("GROMMUNIOSYNC_VERSION", "GIT");
}
}

0 comments on commit 02dd016

Please sign in to comment.