Merge pull request '* Fix bug #35772, fix ssh command error of windows node.' (#73) from sprint/zk_fixbug into 18.4
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/73
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
<?php $browseLink = $this->session->zanodeList ? $this->session->zanodeList : $this->createLink('zanode', 'browse', "");?>
|
||||
<?php
|
||||
$vars = "id={$zanode->id}&orderBy=%s";
|
||||
$account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccount : $config->zanode->defaultAccount;
|
||||
$account = strpos(strtolower($zanode->osName), "windows") !== false ? $config->zanode->defaultWinAccount : $config->zanode->defaultAccount;
|
||||
$ssh = $zanode->hostType == 'physics' ? ('ssh ' . $zanode->extranet) : ($zanode->ssh ? 'ssh ' . $account . '@' . $zanode->ip . ' -p ' . $zanode->ssh : '');
|
||||
?>
|
||||
<div id='mainMenu' class='clearfix'>
|
||||
|
||||
Reference in New Issue
Block a user