';
+ unset($this->data, $this->form, $fields);
+
+ echo '';
+ $fields = array(
_('System Manufacturer') => $sysman,
_('System Product') => $sysprod,
_('System Version') => $sysver,
@@ -2497,21 +2540,18 @@ public function hostInventory()
_('Chassis Manufacturer') => $caseman,
_('Chassis Version') => $casever,
_('Chassis Serial') => $caseser,
- _('Chassis Asset') => $caseast,
- '
'
+ _('Chassis Asset') => $caseast
);
- $this->title = _('Host Hardware Inventory');
+ for ($i = 0; $i < count($gpuvendorsArray); $i++) {
+ $fields[_("GPU-$i Vendor")] = $gpuvendorsArray[$i];
+ $fields[_("GPU-$i Product")] = $gpuproductsArray[$i];
+ }
if ($this->obj->get('inventory')->isValid()) {
array_walk($fields, $this->fieldsToData);
}
self::$HookManager
->processEvent(
- 'HOST_INVENTORY',
+ 'HOST_INVENTORY_STATIC',
array(
'headerData' => &$this->headerData,
'data' => &$this->data,
@@ -2519,29 +2559,23 @@ public function hostInventory()
'attributes' => &$this->attributes
)
);
- echo '';
- echo '
';
- echo '
';
+ echo '
';
echo '
';
echo '
';
- echo $this->title;
+ echo $this->title . ' ' . _('Static');
echo '
';
echo '';
echo '
';
- echo '';
echo '
';
echo '
';
echo '
';
unset(
$this->data,
- $this->form,
$this->headerData,
$this->templates,
- $this->attributes
+ $this->attributes,
+ $fields
);
}
/**
diff --git a/packages/web/lib/plugins/ldap/class/ldap.class.php b/packages/web/lib/plugins/ldap/class/ldap.class.php
index 0db2c7672f..aaea1977ab 100644
--- a/packages/web/lib/plugins/ldap/class/ldap.class.php
+++ b/packages/web/lib/plugins/ldap/class/ldap.class.php
@@ -556,7 +556,7 @@ public function authLDAP($user, $pass)
* are admins.
*/
if ($useGroupMatch) {
- $accessLevel = $this->_getAccessLevel($grpMemAttr, $userDN);
+ $accessLevel = $this->_getAccessLevel($grpMemAttr, $userDN, $user);
} else {
$accessLevel = 2;
}
@@ -593,10 +593,11 @@ public function authLDAP($user, $pass)
*
* @param string $grpMemAttr the group finder item
* @param string $userDN the user dn information
+ * @param string $user the username
*
* @return int
*/
- private function _getAccessLevel($grpMemAttr, $userDN)
+ private function _getAccessLevel($grpMemAttr, $userDN, $user)
{
/**
* Preset our access level value
@@ -610,6 +611,10 @@ private function _getAccessLevel($grpMemAttr, $userDN)
* Get our user group
*/
$userGroup = $this->get('userGroup');
+ /**
+ * The user name attribute in use (e.g. uid=)
+ */
+ $usrNamAttr = strtolower($this->get('userNamAttr'));
/**
* Use search base where the groups are located
*/
@@ -623,11 +628,19 @@ private function _getAccessLevel($grpMemAttr, $userDN)
*/
$adminGroups = explode(',', $adminGroup);
$adminGroups = array_map('trim', $adminGroups);
+ $grpMemAttr_forimplode = ')(' . $grpMemAttr . '=';
$filter = sprintf(
- '(&(|(name=%s))(%s=%s))',
+ '(&(|(name=%s)(%s=%s))(|(%s=%s)(%s=%s=%s)(%s=%s)))',
implode(')(name=', (array)$adminGroups),
$grpMemAttr,
- $this->escape($userDN, null, LDAP_ESCAPE_FILTER)
+ implode($grpMemAttr_forimplode, (array)$adminGroups),
+ $grpMemAttr,
+ $this->escape($userDN, null, LDAP_ESCAPE_FILTER),
+ $grpMemAttr,
+ $usrNamAttr,
+ $this->escape($user, null, LDAP_ESCAPE_FILTER),
+ $usrNamAttr,
+ $this->escape($user, null, LDAP_ESCAPE_FILTER)
);
/**
* The attribute to get.
@@ -648,10 +661,17 @@ private function _getAccessLevel($grpMemAttr, $userDN)
$userGroups = explode(',', $userGroup);
$userGroups = array_map('trim', $userGroups);
$filter = sprintf(
- '(&(|(name=%s))(%s=%s))',
+ '(&(|(name=%s)(%s=%s))(|(%s=%s)(%s=%s=%s)(%s=%s)))',
implode(')(name=', (array)$userGroups),
$grpMemAttr,
- $this->escape($userDN, null, LDAP_ESCAPE_FILTER)
+ implode($grpMemAttr_forimplode, (array)$userGroups),
+ $grpMemAttr,
+ $this->escape($userDN, null, LDAP_ESCAPE_FILTER),
+ $grpMemAttr,
+ $usrNamAttr,
+ $this->escape($user, null, LDAP_ESCAPE_FILTER),
+ $usrNamAttr,
+ $this->escape($user, null, LDAP_ESCAPE_FILTER)
);
/**
* The attribute to get.
diff --git a/packages/web/lib/plugins/ldap/pages/ldapmanagementpage.class.php b/packages/web/lib/plugins/ldap/pages/ldapmanagementpage.class.php
index 7f9826b027..e4f786cc39 100644
--- a/packages/web/lib/plugins/ldap/pages/ldapmanagementpage.class.php
+++ b/packages/web/lib/plugins/ldap/pages/ldapmanagementpage.class.php
@@ -204,7 +204,7 @@ public function add()
$searchScopes = array(
_('Base Only'),
_('Subtree Only'),
- _('Subree and Below')
+ _('Subtree and Below')
);
$searchSel = self::selectForm(
'searchScope',
@@ -651,7 +651,7 @@ public function ldapGeneral()
$searchScopes = array(
_('Base Only'),
_('Subtree Only'),
- _('Subree and Below')
+ _('Subtree and Below')
);
$searchSel = self::selectForm(
'searchScope',
diff --git a/packages/web/lib/plugins/slack/class/slack.class.php b/packages/web/lib/plugins/slack/class/slack.class.php
index d1ff3303f0..b31a82a3d6 100644
--- a/packages/web/lib/plugins/slack/class/slack.class.php
+++ b/packages/web/lib/plugins/slack/class/slack.class.php
@@ -14,7 +14,7 @@ class Slack extends FOGController
public function getChannels()
{
$channels = array();
- $channelnames = $this->call('channels.list');
+ $channelnames = $this->call('conversations.list');
if (!$channelnames['ok']) {
throw new SlackException(_('Channel call is invalid'));
}
diff --git a/packages/web/lib/plugins/slack/class/slackhandler.class.php b/packages/web/lib/plugins/slack/class/slackhandler.class.php
index 23b7bf8f8c..e6a44d2a6c 100644
--- a/packages/web/lib/plugins/slack/class/slackhandler.class.php
+++ b/packages/web/lib/plugins/slack/class/slackhandler.class.php
@@ -9,7 +9,8 @@ class SlackHandler extends Slack
'api.test',
// auth
'auth.test',
- // chanels
+ // channels
+ 'conversations.list',
'channels.archive',
'channels.create',
'channels.history',
diff --git a/packages/web/lib/plugins/slack/events/imagecomplete_slack.event.php b/packages/web/lib/plugins/slack/events/imagecomplete_slack.event.php
index 2d2fd3e39d..0fa74563e4 100755
--- a/packages/web/lib/plugins/slack/events/imagecomplete_slack.event.php
+++ b/packages/web/lib/plugins/slack/events/imagecomplete_slack.event.php
@@ -71,9 +71,9 @@ public function onEvent($event, $data)
$args = array(
'channel' => $Token->get('name'),
'text' => sprintf(
- '%s %s',
+ 'Host: %s %s',
$data['HostName'],
- _('Completed imaging')
+ _('completed imaging.')
)
);
$Token->call('chat.postMessage', $args);
diff --git a/packages/web/lib/plugins/slack/events/imagefail_slack.event.php b/packages/web/lib/plugins/slack/events/imagefail_slack.event.php
index 94761583dd..04c7f799d2 100755
--- a/packages/web/lib/plugins/slack/events/imagefail_slack.event.php
+++ b/packages/web/lib/plugins/slack/events/imagefail_slack.event.php
@@ -67,7 +67,11 @@ public function onEvent($event, $data)
) {
$args = array(
'channel' => $Token->get('name'),
- 'text' => "{$data[HostName]} Failed imaging",
+ 'text' => sprintf(
+ 'Host: %s %s',
+ $data['HostName'],
+ _('imaging failed.')
+ )
);
$Token->call('chat.postMessage', $args);
unset($Token);
diff --git a/packages/web/lib/plugins/slack/events/snapincomplete_slack.event.php b/packages/web/lib/plugins/slack/events/snapincomplete_slack.event.php
index 74a7791ded..dfcd23043a 100755
--- a/packages/web/lib/plugins/slack/events/snapincomplete_slack.event.php
+++ b/packages/web/lib/plugins/slack/events/snapincomplete_slack.event.php
@@ -19,20 +19,20 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link https://fogproject.org
*/
-class SnapinComplete_Slack extends PushbulletExtends
+class SnapinComplete_Slack extends Event
{
/**
* The name of this event
*
* @var string
*/
- protected $name = 'SnapinComplete_Slack';
+ public $name = 'SnapinComplete_Slack';
/**
* The description of this event
*
* @var string
*/
- protected $description = 'Triggers when a host completes snapin taskings';
+ public $description = 'Triggers when a host completes snapin taskings';
/**
* The event is active
*
@@ -65,14 +65,16 @@ public function onEvent($event, $data)
foreach ((array)self::getClass('SlackManager')
->find() as &$Token
) {
- self::$message = sprintf(
- 'Host %s has completed snapin tasking.',
- $data['Host']->get('name')
+ $args = array(
+ 'channel' => $Token->get('name'),
+ 'text' => sprintf(
+ 'Host: %s %s',
+ $data['HostName'],
+ _('completed snapin tasking.')
+ )
);
- self::$shortdesc = 'Snapin(s) Complete';
- $Token->call('chat.postMessage', $message);
+ $Token->call('chat.postMessage', $args);
unset($Token);
}
- parent::onEvent($event, $data);
}
}
diff --git a/packages/web/lib/plugins/slack/events/snapintaskcomplete_slack.event.php b/packages/web/lib/plugins/slack/events/snapintaskcomplete_slack.event.php
index dc45c5f603..17fd40f1f3 100755
--- a/packages/web/lib/plugins/slack/events/snapintaskcomplete_slack.event.php
+++ b/packages/web/lib/plugins/slack/events/snapintaskcomplete_slack.event.php
@@ -19,20 +19,20 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link https://fogproject.org
*/
-class SnapinTaskComplete_Slack extends PushbulletExtends
+class SnapinTaskComplete_Slack extends Event
{
/**
* The name of the event
*
* @var string
*/
- protected $name = 'SnapinTaskComplete_Slack';
+ public $name = 'SnapinTaskComplete_Slack';
/**
* The description of the event
*
* @var string
*/
- protected $description = 'Triggers when a host completes snapin task';
+ public $description = 'Triggers when a host completes snapin task';
/**
* The event is active
*
@@ -62,15 +62,19 @@ public function __construct()
*/
public function onEvent($event, $data)
{
- self::$message = sprintf(
- 'The snapin has completed installation on %s with status code: %s',
- $data['Host']->get('name'),
- $data['SnapinTask']->get('return')
- );
- self::$shortdesc = sprintf(
- '%s completed',
- $data['Snapin']->get('name')
- );
- parent::onEvent($event, $data);
+ foreach ((array)self::getClass('SlackManager')
+ ->find() as &$Token
+ ) {
+ $args = array(
+ 'channel' => $Token->get('name'),
+ 'text' => sprintf(
+ 'The snapin has completed installation on %s with status code: %s',
+ $data['Host']->get('name'),
+ $data['SnapinTask']->get('return')
+ )
+ );
+ $Token->call('chat.postMessage', $args);
+ unset($Token);
+ }
}
}
diff --git a/packages/web/lib/plugins/slack/pages/slackmanagementpage.class.php b/packages/web/lib/plugins/slack/pages/slackmanagementpage.class.php
index b67e164803..ff0466d49c 100644
--- a/packages/web/lib/plugins/slack/pages/slackmanagementpage.class.php
+++ b/packages/web/lib/plugins/slack/pages/slackmanagementpage.class.php
@@ -228,6 +228,7 @@ public function addPost()
_('Invalid token passed')
);
}
+ $user = preg_replace('/^[#]|^[@]/', '', $user);
$search = array_search(
$user,
self::fastmerge(
diff --git a/packages/web/lib/reg-task/taskqueue.class.php b/packages/web/lib/reg-task/taskqueue.class.php
index 7f25b6d90a..289d15f77a 100644
--- a/packages/web/lib/reg-task/taskqueue.class.php
+++ b/packages/web/lib/reg-task/taskqueue.class.php
@@ -31,10 +31,17 @@ public function checkIn()
{
try {
self::randWait();
- $this->Task
- ->set('stateID', self::getCheckedInState())
- ->set('checkinTime', self::formatTime('now', 'Y-m-d H:i:s'))
- ->save();
+ // $this->Task
+ // ->set('stateID', self::getCheckedInState())
+ // ->set('checkinTime', self::formatTime('now', 'Y-m-d H:i:s'))
+ // ->save();
+ $this->Task->set(
+ 'stateID',
+ self::getCheckedInState()
+ )->set(
+ 'checkInTime',
+ self::formatTime('now', 'Y-m-d H:i:s')
+ );
if (!$this->Task->save()) {
throw new Exception(_('Failed to update task'));
}
diff --git a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
index ed3c9f1d9c..07a7ad165d 100644
--- a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
@@ -1069,10 +1069,6 @@ msgstr "Fertigstellungszeit"
msgid "Completed"
msgstr "Abgeschlossen"
-#, fuzzy
-msgid "Completed imaging"
-msgstr "Abgeschlossen"
-
msgid "Compression"
msgstr "Kompression"
@@ -1233,9 +1229,6 @@ msgstr "Erstellte Aufgaben für"
msgid "Created by FOG Reg on"
msgstr "Erstellt von FOG Reg am"
-msgid "Created file extension must be, jpg, jpeg, or png"
-msgstr ""
-
#, fuzzy
msgid "Credits"
msgstr "Credits"
@@ -1577,6 +1570,10 @@ msgstr "Knoten bearbeiten"
msgid "Edit User"
msgstr "Benutzer bearbeiten"
+#, fuzzy
+msgid "Editable"
+msgstr "Bearbeiten"
+
msgid "Either reboot or shutdown action must be used."
msgstr "Entweder neustarten oder herunterfahren"
@@ -2187,6 +2184,14 @@ msgstr "Methode ist nicht vorhanden"
msgid "GNU Gneral Public License"
msgstr "GNU General Public License"
+#, fuzzy
+msgid "GPU Products"
+msgstr "Produktschlüssel der Gruppe"
+
+#, fuzzy
+msgid "GPU Vendors"
+msgstr "BIOS-Anbieter"
+
msgid "General"
msgstr "Allgemein"
@@ -5750,6 +5755,10 @@ msgstr "wird gestartet..."
msgid "State"
msgstr "Zustand"
+#, fuzzy
+msgid "Static"
+msgstr "Zustand"
+
msgid "Status"
msgstr "Status"
@@ -5936,12 +5945,13 @@ msgstr "Gruppe aktualisiert"
msgid "Subnets"
msgstr ""
-msgid "Subree and Below"
-msgstr "Nur Teilstruktur"
-
msgid "Subtree Only"
msgstr ""
+#, fuzzy
+msgid "Subtree and Below"
+msgstr "Nur Teilstruktur"
+
msgid "Successful"
msgstr "Erfolgreich"
@@ -7135,6 +7145,14 @@ msgstr "Client"
msgid "clients"
msgstr "Client"
+#, fuzzy
+msgid "completed imaging."
+msgstr "Abgeschlossen"
+
+#, fuzzy
+msgid "completed snapin tasking."
+msgstr "Abgeschlossen"
+
msgid "config files that run on the client computers."
msgstr ""
"Konfigurationsdateien aktualisieren, die auf den Clientcomputern ausgeführt "
@@ -7385,6 +7403,10 @@ msgstr "Images"
msgid "images to a storage group"
msgstr "bildet ab zu einer Speichergruppe"
+#, fuzzy
+msgid "imaging failed."
+msgstr "Laden fehlgeschlagen: %s"
+
msgid "in seconds"
msgstr "in Sekunden"
diff --git a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
index d09f9aee3d..cfec626174 100644
--- a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
@@ -1065,10 +1065,6 @@ msgstr "Task Checkin Time"
msgid "Completed"
msgstr "Completed"
-#, fuzzy
-msgid "Completed imaging"
-msgstr "Completed"
-
msgid "Compression"
msgstr "Compression"
@@ -1229,9 +1225,6 @@ msgstr "Create User"
msgid "Created by FOG Reg on"
msgstr "Created by FOG Reg on"
-msgid "Created file extension must be, jpg, jpeg, or png"
-msgstr ""
-
#, fuzzy
msgid "Credits"
msgstr "Create"
@@ -1573,6 +1566,10 @@ msgstr "Edit Node"
msgid "Edit User"
msgstr "Edit User"
+#, fuzzy
+msgid "Editable"
+msgstr "Edit"
+
msgid "Either reboot or shutdown action must be used."
msgstr ""
@@ -2183,6 +2180,14 @@ msgstr "Method does not exist"
msgid "GNU Gneral Public License"
msgstr ""
+#, fuzzy
+msgid "GPU Products"
+msgstr "Group Product Key"
+
+#, fuzzy
+msgid "GPU Vendors"
+msgstr "BIOS Vendor"
+
msgid "General"
msgstr "General"
@@ -5738,6 +5743,10 @@ msgstr "Starting process..."
msgid "State"
msgstr "State"
+#, fuzzy
+msgid "Static"
+msgstr "State"
+
msgid "Status"
msgstr "Status"
@@ -5924,10 +5933,10 @@ msgstr "Group added"
msgid "Subnets"
msgstr ""
-msgid "Subree and Below"
+msgid "Subtree Only"
msgstr ""
-msgid "Subtree Only"
+msgid "Subtree and Below"
msgstr ""
msgid "Successful"
@@ -7126,6 +7135,14 @@ msgstr "Client"
msgid "clients"
msgstr "Client"
+#, fuzzy
+msgid "completed imaging."
+msgstr "Completed"
+
+#, fuzzy
+msgid "completed snapin tasking."
+msgstr "Completed"
+
msgid "config files that run on the client computers."
msgstr ""
@@ -7374,6 +7391,10 @@ msgstr "Images"
msgid "images to a storage group"
msgstr "Primary Storage Group"
+#, fuzzy
+msgid "imaging failed."
+msgstr "Load failed: %s"
+
msgid "in seconds"
msgstr ""
diff --git a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
index e06ebe9056..448d125563 100755
--- a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
@@ -1052,9 +1052,6 @@ msgstr "Completada"
msgid "Completed"
msgstr ""
-msgid "Completed imaging"
-msgstr ""
-
msgid "Compression"
msgstr ""
@@ -1206,9 +1203,6 @@ msgstr ""
msgid "Created by FOG Reg on"
msgstr "Creado por"
-msgid "Created file extension must be, jpg, jpeg, or png"
-msgstr ""
-
msgid "Credits"
msgstr "Créditos"
@@ -1538,6 +1532,10 @@ msgstr "Editar"
msgid "Edit User"
msgstr "Usuario"
+#, fuzzy
+msgid "Editable"
+msgstr "Editar"
+
msgid "Either reboot or shutdown action must be used."
msgstr ""
@@ -2164,6 +2162,14 @@ msgstr ""
msgid "GNU Gneral Public License"
msgstr ""
+#, fuzzy
+msgid "GPU Products"
+msgstr "Grupo principal"
+
+#, fuzzy
+msgid "GPU Vendors"
+msgstr "Versión"
+
msgid "General"
msgstr ""
@@ -5722,6 +5728,10 @@ msgstr ""
msgid "State"
msgstr "Estado"
+#, fuzzy
+msgid "Static"
+msgstr "Estado"
+
msgid "Status"
msgstr "Estado"
@@ -5916,10 +5926,10 @@ msgstr "Grupo de almacenamiento actualizado"
msgid "Subnets"
msgstr ""
-msgid "Subree and Below"
+msgid "Subtree Only"
msgstr ""
-msgid "Subtree Only"
+msgid "Subtree and Below"
msgstr ""
msgid "Successful"
@@ -7059,6 +7069,13 @@ msgstr "Cliente"
msgid "clients"
msgstr "Cliente"
+#, fuzzy
+msgid "completed imaging."
+msgstr "Completada"
+
+msgid "completed snapin tasking."
+msgstr ""
+
msgid "config files that run on the client computers."
msgstr ""
@@ -7304,6 +7321,10 @@ msgstr "Imágenes"
msgid "images to a storage group"
msgstr "Añadir grupo de almacenamiento"
+#, fuzzy
+msgid "imaging failed."
+msgstr "Error al cargar"
+
msgid "in seconds"
msgstr ""
diff --git a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
index 9dabcc3972..18562fb0dd 100644
--- a/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po
@@ -930,9 +930,6 @@ msgstr "Durée totale"
msgid "Completed"
msgstr "Terminé"
-msgid "Completed imaging"
-msgstr "Clonage terminé"
-
msgid "Compression"
msgstr "Compression"
@@ -1063,9 +1060,6 @@ msgstr "Tâches créées pour"
msgid "Created by FOG Reg on"
msgstr "Créé par FOG Reg sur"
-msgid "Created file extension must be, jpg, jpeg, or png"
-msgstr ""
-
msgid "Credits"
msgstr "Crédits"
@@ -1370,6 +1364,10 @@ msgstr "Modifier le nœud"
msgid "Edit User"
msgstr "Modifier l'utilisateur"
+#, fuzzy
+msgid "Editable"
+msgstr "Modifier"
+
msgid "Either reboot or shutdown action must be used."
msgstr "L'action de redémarrage ou d'arrêt doit être utilisée."
@@ -1918,6 +1916,14 @@ msgstr "Fonction n'existe pas"
msgid "GNU Gneral Public License"
msgstr "GNU General Public License"
+#, fuzzy
+msgid "GPU Products"
+msgstr "Groupe clé de produit"
+
+#, fuzzy
+msgid "GPU Vendors"
+msgstr "Vendeur du BIOS"
+
msgid "General"
msgstr "Général"
@@ -5056,6 +5062,10 @@ msgstr "Début de process"
msgid "State"
msgstr "État"
+#, fuzzy
+msgid "Static"
+msgstr "État"
+
msgid "Status"
msgstr "Statut"
@@ -5217,12 +5227,13 @@ msgstr "Groupe de sous-réseau mis à jour !"
msgid "Subnets"
msgstr "Sous-réseaux"
-msgid "Subree and Below"
-msgstr "Sous-arbre et dessous"
-
msgid "Subtree Only"
msgstr "Sous-arbre seulement"
+#, fuzzy
+msgid "Subtree and Below"
+msgstr "Sous-arbre et dessous"
+
msgid "Successful"
msgstr "Réussite"
@@ -6274,6 +6285,14 @@ msgstr "client"
msgid "clients"
msgstr "clients"
+#, fuzzy
+msgid "completed imaging."
+msgstr "Clonage terminé"
+
+#, fuzzy
+msgid "completed snapin tasking."
+msgstr "Clonage terminé"
+
msgid "config files that run on the client computers."
msgstr ""
"les fichiers de configuration qui s'exécutent sur les ordinateurs clients."
@@ -6486,6 +6505,10 @@ msgstr "images"
msgid "images to a storage group"
msgstr "images vers un groupe de stockage"
+#, fuzzy
+msgid "imaging failed."
+msgstr "La connexion a échoué"
+
msgid "in seconds"
msgstr "en secondes"
diff --git a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
index 57586f7a45..23cf74ec32 100644
--- a/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po
@@ -957,9 +957,6 @@ msgstr "Tempo completo"
msgid "Completed"
msgstr "Completato"
-msgid "Completed imaging"
-msgstr "Imaging completato"
-
msgid "Compression"
msgstr "Compressione"
@@ -1093,9 +1090,6 @@ msgstr "Create attività per"
msgid "Created by FOG Reg on"
msgstr "Creato da FOG Reg su"
-msgid "Created file extension must be, jpg, jpeg, or png"
-msgstr ""
-
msgid "Credits"
msgstr "Credits"
@@ -1401,6 +1395,10 @@ msgstr "Modifica nodo"
msgid "Edit User"
msgstr "Modifica utente"
+#, fuzzy
+msgid "Editable"
+msgstr "Modifica"
+
msgid "Either reboot or shutdown action must be used."
msgstr "È necessario utilizzare l'azione di riavvio o di arresto."
@@ -1969,6 +1967,14 @@ msgstr "La funzione non esiste"
msgid "GNU Gneral Public License"
msgstr "GNU Gneral Public License"
+#, fuzzy
+msgid "GPU Products"
+msgstr "Product Key Group"
+
+#, fuzzy
+msgid "GPU Vendors"
+msgstr "Venditore BIOS"
+
msgid "General"
msgstr "Generale"
@@ -5148,6 +5154,10 @@ msgstr "Avvio processo"
msgid "State"
msgstr "Stato"
+#, fuzzy
+msgid "Static"
+msgstr "Stato"
+
msgid "Status"
msgstr "Stato"
@@ -5318,12 +5328,13 @@ msgstr "Gruppo aggiornato!"
msgid "Subnets"
msgstr ""
-msgid "Subree and Below"
-msgstr "Sottoalbero e inferiore"
-
msgid "Subtree Only"
msgstr "Solo Sottoalbero"
+#, fuzzy
+msgid "Subtree and Below"
+msgstr "Sottoalbero e inferiore"
+
msgid "Successful"
msgstr "Riuscito"
@@ -6393,6 +6404,14 @@ msgstr "client"
msgid "clients"
msgstr "client"
+#, fuzzy
+msgid "completed imaging."
+msgstr "Imaging completato"
+
+#, fuzzy
+msgid "completed snapin tasking."
+msgstr "Imaging completato"
+
msgid "config files that run on the client computers."
msgstr "file di configurazione eseguiti sui computer client."
@@ -6608,6 +6627,10 @@ msgstr "immagini"
msgid "images to a storage group"
msgstr "Immagini in un gruppo di archiviazione"
+#, fuzzy
+msgid "imaging failed."
+msgstr "Caricamento non riuscito"
+
msgid "in seconds"
msgstr "in secondi"
diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot
index 25148e1f3e..d0d3efd2a3 100644
--- a/packages/web/management/languages/messages.pot
+++ b/packages/web/management/languages/messages.pot
@@ -903,9 +903,6 @@ msgstr ""
msgid "Completed"
msgstr ""
-msgid "Completed imaging"
-msgstr ""
-
msgid "Compression"
msgstr ""
@@ -1036,9 +1033,6 @@ msgstr ""
msgid "Created by FOG Reg on"
msgstr ""
-msgid "Created file extension must be, jpg, jpeg, or png"
-msgstr ""
-
msgid "Credits"
msgstr ""
@@ -1339,6 +1333,9 @@ msgstr ""
msgid "Edit User"
msgstr ""
+msgid "Editable"
+msgstr ""
+
msgid "Either reboot or shutdown action must be used."
msgstr ""
@@ -1883,6 +1880,12 @@ msgstr ""
msgid "GNU Gneral Public License"
msgstr ""
+msgid "GPU Products"
+msgstr ""
+
+msgid "GPU Vendors"
+msgstr ""
+
msgid "General"
msgstr ""
@@ -4985,6 +4988,9 @@ msgstr ""
msgid "State"
msgstr ""
+msgid "Static"
+msgstr ""
+
msgid "Status"
msgstr ""
@@ -5144,10 +5150,10 @@ msgstr ""
msgid "Subnets"
msgstr ""
-msgid "Subree and Below"
+msgid "Subtree Only"
msgstr ""
-msgid "Subtree Only"
+msgid "Subtree and Below"
msgstr ""
msgid "Successful"
@@ -6176,6 +6182,12 @@ msgstr ""
msgid "clients"
msgstr ""
+msgid "completed imaging."
+msgstr ""
+
+msgid "completed snapin tasking."
+msgstr ""
+
msgid "config files that run on the client computers."
msgstr ""
@@ -6386,6 +6398,9 @@ msgstr ""
msgid "images to a storage group"
msgstr ""
+msgid "imaging failed."
+msgstr ""
+
msgid "in seconds"
msgstr ""
diff --git a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
index 70a659b24c..2407db7af7 100644
--- a/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po
@@ -1067,10 +1067,6 @@ msgstr "Tarefa Checkin Tempo"
msgid "Completed"
msgstr "concluído"
-#, fuzzy
-msgid "Completed imaging"
-msgstr "concluído"
-
msgid "Compression"
msgstr "Compressão"
@@ -1233,9 +1229,6 @@ msgstr "Criar usuário"
msgid "Created by FOG Reg on"
msgstr "Criado por FOG Reg em"
-msgid "Created file extension must be, jpg, jpeg, or png"
-msgstr ""
-
#, fuzzy
msgid "Credits"
msgstr "Crio"
@@ -1577,6 +1570,10 @@ msgstr "Editar Nó"
msgid "Edit User"
msgstr "Editar usuário"
+#, fuzzy
+msgid "Editable"
+msgstr "Editar"
+
msgid "Either reboot or shutdown action must be used."
msgstr ""
@@ -2187,6 +2184,14 @@ msgstr "O método não existe"
msgid "GNU Gneral Public License"
msgstr ""
+#, fuzzy
+msgid "GPU Products"
+msgstr "Grupo de Chave de Produto"
+
+#, fuzzy
+msgid "GPU Vendors"
+msgstr "BIOS Vendor"
+
msgid "General"
msgstr "Geral"
@@ -5747,6 +5752,10 @@ msgstr "processo a partir ..."
msgid "State"
msgstr "Estado"
+#, fuzzy
+msgid "Static"
+msgstr "Estado"
+
msgid "Status"
msgstr "estado"
@@ -5933,10 +5942,10 @@ msgstr "grupo adicionado"
msgid "Subnets"
msgstr ""
-msgid "Subree and Below"
+msgid "Subtree Only"
msgstr ""
-msgid "Subtree Only"
+msgid "Subtree and Below"
msgstr ""
msgid "Successful"
@@ -7133,6 +7142,14 @@ msgstr "Cliente"
msgid "clients"
msgstr "Cliente"
+#, fuzzy
+msgid "completed imaging."
+msgstr "concluído"
+
+#, fuzzy
+msgid "completed snapin tasking."
+msgstr "concluído"
+
msgid "config files that run on the client computers."
msgstr ""
@@ -7381,6 +7398,10 @@ msgstr "imagens"
msgid "images to a storage group"
msgstr "Grupo de armazenamento primário"
+#, fuzzy
+msgid "imaging failed."
+msgstr "Carga falhou: %s"
+
msgid "in seconds"
msgstr ""
diff --git a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
index 2d087de630..db58d53b21 100644
--- a/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
+++ b/packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po
@@ -1066,10 +1066,6 @@ msgstr "任务登录时间"
msgid "Completed"
msgstr "完成"
-#, fuzzy
-msgid "Completed imaging"
-msgstr "完成"
-
msgid "Compression"
msgstr "压缩"
@@ -1230,9 +1226,6 @@ msgstr "创建用户"
msgid "Created by FOG Reg on"
msgstr "创建者FOG上注册"
-msgid "Created file extension must be, jpg, jpeg, or png"
-msgstr ""
-
#, fuzzy
msgid "Credits"
msgstr "创建"
@@ -1574,6 +1567,10 @@ msgstr "编辑节点"
msgid "Edit User"
msgstr "编辑用户"
+#, fuzzy
+msgid "Editable"
+msgstr "编辑"
+
msgid "Either reboot or shutdown action must be used."
msgstr ""
@@ -2184,6 +2181,14 @@ msgstr "方法不存在"
msgid "GNU Gneral Public License"
msgstr ""
+#, fuzzy
+msgid "GPU Products"
+msgstr "集团产品密钥"
+
+#, fuzzy
+msgid "GPU Vendors"
+msgstr "BIOS供应商"
+
msgid "General"
msgstr "一般"
@@ -5740,6 +5745,10 @@ msgstr "启动过程中..."
msgid "State"
msgstr "州"
+#, fuzzy
+msgid "Static"
+msgstr "州"
+
msgid "Status"
msgstr "状态"
@@ -5926,10 +5935,10 @@ msgstr "集团补充"
msgid "Subnets"
msgstr ""
-msgid "Subree and Below"
+msgid "Subtree Only"
msgstr ""
-msgid "Subtree Only"
+msgid "Subtree and Below"
msgstr ""
msgid "Successful"
@@ -7113,6 +7122,14 @@ msgstr "客户"
msgid "clients"
msgstr "客户"
+#, fuzzy
+msgid "completed imaging."
+msgstr "完成"
+
+#, fuzzy
+msgid "completed snapin tasking."
+msgstr "完成"
+
msgid "config files that run on the client computers."
msgstr ""
@@ -7359,6 +7376,10 @@ msgstr "图片"
msgid "images to a storage group"
msgstr "主存储组"
+#, fuzzy
+msgid "imaging failed."
+msgstr "加载失败： %s"
+
msgid "in seconds"
msgstr ""
diff --git a/utils/FOGiPXE/buildipxe.sh b/utils/FOGiPXE/buildipxe.sh
index 53f039f71e..6472b8df4b 100755
--- a/utils/FOGiPXE/buildipxe.sh
+++ b/utils/FOGiPXE/buildipxe.sh
@@ -80,21 +80,21 @@ cp ${FOGDIR}/src/ipxe/src-efi/config/console.h config/
# Build the files
make EMBED=ipxescript bin-{i386,x86_64}-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${BUILDOPTS}
[[ $? -eq 0 ]] || exit 80
-[[ "x$armsupport" == "x1" ]] && make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 EMBED=ipxescript bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${BUILDOPTS} || true
+make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 EMBED=ipxescript bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${BUILDOPTS}
[[ $? -eq 0 ]] || exit 82
# Copy the files to upload
-[[ "x$armsupport" == "x1" ]] && cp bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/arm64-efi/
+bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/arm64-efi/
cp bin-i386-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/i386-efi/
cp bin-x86_64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/
# Build with 10 second delay
make EMBED=ipxescript10sec bin-{i386,x86_64}-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${BUILDOPTS}
[[ $? -eq 0 ]] || exit 91
-[[ "x$armsupport" == "x1" ]] && make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 EMBED=ipxescript10sec bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${BUILDOPTS} || true
+make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 EMBED=ipxescript10sec bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${BUILDOPTS}
[[ $? -eq 0 ]] || exit 93
# Copy the files to upload
-[[ "x$armsupport" == "x1" ]] && cp bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/10secdelay/arm64-efi/
+cp bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/10secdelay/arm64-efi/
cp bin-i386-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/10secdelay/i386-efi/
cp bin-x86_64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/10secdelay/
diff --git a/utils/FOGiPXE/buildipxe_forpublish.sh b/utils/FOGiPXE/buildipxe_forpublish.sh
index 32ea1301e0..a50b01184e 100755
--- a/utils/FOGiPXE/buildipxe_forpublish.sh
+++ b/utils/FOGiPXE/buildipxe_forpublish.sh
@@ -69,21 +69,21 @@ cp ${FOGDIR}/src/ipxe/src-efi/config/console.h config/
# Build the files
make EMBED=ipxescript bin-{i386,x86_64}-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi
[[ $? -eq 0 ]] || exit 80
-[[ "x$armsupport" == "x1" ]] && make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 EMBED=ipxescript bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi || true
+make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 EMBED=ipxescript bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi
[[ $? -eq 0 ]] || exit 82
# Copy the files to upload
-[[ "x$armsupport" == "x1" ]] && cp bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/arm64-efi/
+cp bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/arm64-efi/
cp bin-i386-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/i386-efi/
cp bin-x86_64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/
# Build with 10 second delay
make EMBED=ipxescript10sec bin-{i386,x86_64}-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi
[[ $? -eq 0 ]] || exit 91
-[[ "x$armsupport" == "x1" ]] && make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 EMBED=ipxescript10sec bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi || true
+make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 EMBED=ipxescript10sec bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi
[[ $? -eq 0 ]] || exit 93
# Copy the files to upload
-[[ "x$armsupport" == "x1" ]] && cp bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/10secdelay/arm64-efi/
+cp bin-arm64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/10secdelay/arm64-efi/
cp bin-i386-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/10secdelay/i386-efi/
cp bin-x86_64-efi/{snp{,only},ipxe,intel,realtek,ncm--ecm--axge}.efi ${FOGDIR}/packages/tftp/10secdelay/