diff --git a/frontend/locales/english.lng b/frontend/locales/english.lng index 4036706..aa3211a 100644 --- a/frontend/locales/english.lng +++ b/frontend/locales/english.lng @@ -257,6 +257,7 @@ list-column-nodeid; Node ID list-status-running; Running list-status-stopped; Stopped list-status-suspended; Suspended +list-status-unknown; Status unknown ## Node list title-admin-nodelist; Node overview diff --git a/frontend/module.admin.containers.php b/frontend/module.admin.containers.php index ba490ed..e647749 100644 --- a/frontend/module.admin.containers.php +++ b/frontend/module.admin.containers.php @@ -27,7 +27,7 @@ if($result = mysql_query_cached("SELECT * FROM containers")) } catch (SshException $e) { - $sStatus = "stopped"; + $sStatus = "unknown"; } $sVpsList[] = array( diff --git a/frontend/module.list.php b/frontend/module.list.php index c1c7e44..ed938fc 100644 --- a/frontend/module.list.php +++ b/frontend/module.list.php @@ -29,7 +29,7 @@ if($sLoggedIn === true) } catch (SshException $e) { - $sStatus = "stopped"; + $sStatus = "unknown"; } $sContainerList[] = array( diff --git a/frontend/templates/default/admin/node/lookup.tpl b/frontend/templates/default/admin/node/lookup.tpl index 2ec8a96..cfb9f05 100644 --- a/frontend/templates/default/admin/node/lookup.tpl +++ b/frontend/templates/default/admin/node/lookup.tpl @@ -35,12 +35,14 @@ {%foreach container in containers} - {%if container[status] == running} + {%if vps[status] == running} {%!list-status-running} - {%/if}{%if container[status] == stopped} + {%elseif vps[status] == stopped} {%!list-status-stopped} - {%/if}{%if container[status] == suspended} + {%elseif vps[status] == suspended} {%!list-status-suspended} + {%else} + {%!list-status-unknown} {%/if} diff --git a/frontend/templates/default/admin/user/lookup.tpl b/frontend/templates/default/admin/user/lookup.tpl index ef0cd47..84397fa 100644 --- a/frontend/templates/default/admin/user/lookup.tpl +++ b/frontend/templates/default/admin/user/lookup.tpl @@ -52,14 +52,15 @@ {%foreach container in containers} - {%if container[status] == running} + {%if vps[status] == running} {%!list-status-running} - {%/if}{%if container[status] == stopped} + {%elseif vps[status] == stopped} {%!list-status-stopped} - {%/if}{%if container[status] == suspended} + {%elseif vps[status] == suspended} {%!list-status-suspended} + {%else} + {%!list-status-unknown} {%/if} - {%?container[hostname]} diff --git a/frontend/templates/default/admin/vps/list.tpl b/frontend/templates/default/admin/vps/list.tpl index af76456..e10d6f9 100644 --- a/frontend/templates/default/admin/vps/list.tpl +++ b/frontend/templates/default/admin/vps/list.tpl @@ -14,10 +14,12 @@ {%if vps[status] == running} {%!list-status-running} - {%/if}{%if vps[status] == stopped} + {%elseif vps[status] == stopped} {%!list-status-stopped} - {%/if}{%if vps[status] == suspended} + {%elseif vps[status] == suspended} {%!list-status-suspended} + {%else} + {%!list-status-unknown} {%/if} diff --git a/frontend/templates/default/client/vps/list.tpl b/frontend/templates/default/client/vps/list.tpl index a248dd5..0eb1210 100644 --- a/frontend/templates/default/client/vps/list.tpl +++ b/frontend/templates/default/client/vps/list.tpl @@ -11,12 +11,14 @@ {%foreach container in containers} - {%if container[status] == running} + {%if vps[status] == running} {%!list-status-running} - {%/if}{%if container[status] == stopped} + {%elseif vps[status] == stopped} {%!list-status-stopped} - {%/if}{%if container[status] == suspended} + {%elseif vps[status] == suspended} {%!list-status-suspended} + {%else} + {%!list-status-unknown} {%/if}