diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php index f66df64409..fde19ea978 100644 --- a/packages/web/lib/fog/system.class.php +++ b/packages/web/lib/fog/system.class.php @@ -53,7 +53,7 @@ private static function _versionCompare() public function __construct() { self::_versionCompare(); - define('FOG_VERSION', '941451'); + define('FOG_VERSION', '992916'); define('FOG_SCHEMA', 244); define('FOG_BCACHE_VER', 111); define('FOG_SVN_REVISION', 6052); diff --git a/packages/web/lib/plugins/capone/reg-task/caponetasking.class.php b/packages/web/lib/plugins/capone/reg-task/caponetasking.class.php index 6736d9472a..41bb4757a4 100644 --- a/packages/web/lib/plugins/capone/reg-task/caponetasking.class.php +++ b/packages/web/lib/plugins/capone/reg-task/caponetasking.class.php @@ -62,13 +62,13 @@ public function __construct() try { $strSetup = "%s|%s|%s|%s|%s|%s|%s"; ob_start(); - $Capones = self::getClass('CaponeManager') + foreach ((array)self::getClass('CaponeManager') ->find( array( 'key' => trim(base64_decode($_REQUEST['key'])) ) - ); - foreach ((array)$Capones as &$Capone) { + ) as &$Capone + ) { $Image = $Capone->getImage(); if (!$Image->isValid()) { continue; diff --git a/packages/web/lib/plugins/ldap/hooks/ldappluginhook.hook.php b/packages/web/lib/plugins/ldap/hooks/ldappluginhook.hook.php index 9ed5e31d22..3cc5041e19 100644 --- a/packages/web/lib/plugins/ldap/hooks/ldappluginhook.hook.php +++ b/packages/web/lib/plugins/ldap/hooks/ldappluginhook.hook.php @@ -90,11 +90,12 @@ public function checkAddUser($arguments) ) ); } - $ldaps = self::getClass('LDAPManager')->find(); /** * Create our new user (initially at least */ - foreach ((array)$ldaps as &$ldap) { + foreach ((array)self::getClass('LDAPManager') + ->find() as &$ldap + ) { $access = $ldap->authLDAP($user, $pass); unset($ldap); switch ($access) { diff --git a/packages/web/lib/plugins/location/hooks/addlocationhost.hook.php b/packages/web/lib/plugins/location/hooks/addlocationhost.hook.php index d497b3fd7d..3a93a5500f 100644 --- a/packages/web/lib/plugins/location/hooks/addlocationhost.hook.php +++ b/packages/web/lib/plugins/location/hooks/addlocationhost.hook.php @@ -91,22 +91,31 @@ public function hostData($arguments) } $arguments['templates'][4] = '${location}
${deployed}'; foreach ((array)$arguments['data'] as $index => &$vals) { - $Locations = self::getClass('LocationAssociationManager')->find( - array( - 'hostID' => $vals['id'] - ) + $find = array( + 'hostID' => $vals['id'] + ); + $Locations = self::getSubObjectIDs( + 'LocationAssociation', + $find, + 'locationID' ); - if (count($Locations) !== 1) { + $cnt = self::getClass('LocationManager') + ->count( + array('id' => $Locations) + ); + if ($cnt !== 1) { $arguments['data'][$index]['location'] = ''; continue; } - foreach ((array)$Locations as &$Location) { + foreach ((array)self::getClass('LocationManager') + ->find(array('id' => $Locations)) as &$Location + ) { $arguments['data'][$index]['location'] = $Location - ->getLocation() ->get('name'); unset($Location); } unset($vals); + unset($Locations); } } /** @@ -126,11 +135,6 @@ public function hostFields($arguments) if ($node != 'host') { return; } - $Locations = self::getClass('LocationAssociationManager')->find( - array( - 'hostID' => $arguments['Host']->get('id') - ) - ); $Locations = self::getSubObjectIDs( 'LocationAssociation', array( @@ -138,13 +142,20 @@ public function hostFields($arguments) ), 'locationID' ); - $cnt = count($Locations); + $cnt = self::getClass('LocationManager')->count( + array( + 'id' => $Locations + ) + ); if ($cnt !== 1) { $locID = 0; } else { + $Locations = self::getSubObjectIDs( + 'Location', + array('id' => $Locations) + ); $locID = array_shift($Locations); } - unset($Locations); $this->arrayInsertAfter( _('Host Product Key'), $arguments['fields'], @@ -189,6 +200,13 @@ public function hostAddLocation($arguments) 'hostID' => $arguments['Host']->get('id') ) ); + $cnt = self::getClass('LocationManager') + ->count( + array('id' => $_REQUEST['location']) + ); + if ($cnt !== 1) { + return; + } self::getClass('LocationAssociation') ->set('hostID', $arguments['Host']->get('id')) ->load('hostID') @@ -225,17 +243,26 @@ public function hostExport($arguments) if (!in_array($this->node, (array)$_SESSION['PluginsInstalled'])) { return; } - $Locations = self::getClass('LocationAssociationManager')->find( - array( - 'hostID' => $arguments['Host']->get('id') - ) + $find = array( + 'hostID' => $arguments['Host']->get('id') + ); + $Locations = self::getSubObjectIDs( + 'LocationAssociation', + $find, + 'locationID' + ); + $cnt = self::getClass('LocationManager')->count( + array('id' => $Locations) ); - if (count($Locations) < 1) { + if ($cnt !== 1) { $arguments['report']->addCSVCell(''); + return; } - foreach ((array)$Locations as &$Location) { + foreach ((array)self::getClass('LocationManager') + ->find(array('id' => $Locations)) as &$Location + ) { $arguments['report']->addCSVCell( - $Location->getLocation()->get('id') + $Location->get('id') ); unset($Location); } @@ -271,18 +298,25 @@ public function hostEmailHook($arguments) if (!in_array($this->node, (array)$_SESSION['PluginsInstalled'])) { return; } - $Locations = self::getClass('LocationAssociationManager')->find( + $Locations = self::getSubObjectIDs( + 'LocationAssociation', array( 'hostID' => $arguments['Host']->get('id') - ) + ), + 'locationID' ); - if (count($Locations) < 1) { + $cnt = self::getClass('LocationManager') + ->count(array('id' => $Locations)); + if ($cnt !== 1) { $locName = ''; - } - foreach ((array)$Locations as $Location) { - $locName = $Location->getLocation()->get('name'); - unset($Location); - break; + } else { + foreach ((array)self::getClass('LocationManager') + ->find(array('id' => $Locations)) as $Location + ) { + $locName = $Location->get('name'); + unset($Location); + break; + } } $this->arrayInsertAfter( "\nSnapin Used: ", @@ -309,6 +343,11 @@ public function hostRegister($arguments) if (!in_array($this->node, (array)$_SESSION['PluginsInstalled'])) { return; } + $cnt = self::getClass('LocationManager') + ->count(array('id' => $_REQUEST['location'])); + if ($cnt !== 1) { + return; + } self::getClass('LocationAssociation') ->set('hostID', $arguments['Host']->get('id')) ->set('locationID', $_REQUEST['location']) @@ -334,17 +373,23 @@ public function hostInfoExpose($arguments) if (!in_array($this->node, (array)$_SESSION['PluginsInstalled'])) { return; } - $Locations = self::getClass('LocationAssociationManager')->find( + $Locations = self::getSubObjectIDs( + 'LocationAssociation', array( 'hostID' => $arguments['Host']->get('id') - ) + ), + 'locationID' ); - if (count($Locations) < 1) { + $cnt = self::getClass('LocationManager') + ->count(array('id' => $Locations)); + if ($cnt !== 1) { $arguments['repFields']['location'] = ''; + return; } - foreach ((array)$Locations as &$Location) { + foreach ((array)self::getClass('LocationManager') + ->find(array('id' => $Locations)) as &$Location + ) { $arguments['repFields']['location'] = $Location - ->getLocation() ->get('name'); unset($Location); } diff --git a/packages/web/lib/plugins/location/hooks/addlocationtasks.hook.php b/packages/web/lib/plugins/location/hooks/addlocationtasks.hook.php index 885b92474e..933bc4fcbb 100644 --- a/packages/web/lib/plugins/location/hooks/addlocationtasks.hook.php +++ b/packages/web/lib/plugins/location/hooks/addlocationtasks.hook.php @@ -84,17 +84,23 @@ public function tasksActiveData($arguments) $arguments['templates'][4] = '${location}'; $arguments['attributes'][4] = array('class'=>'r'); foreach ((array)$arguments['data'] as $i => &$data) { - $Locations = self::getClass('LocationAssociationManager')->find( + $Locations = self::getSubObjectIDs( + 'LocationAssociation', array( 'hostID' => $data['host_id'] - ) + ), + 'locationID' ); - if (count($Locations) < 1) { + $cnt = self::getClass('LocationManager') + ->count(array('id' => $Locations)); + if ($cnt !== 1) { $arguments['data'][$i]['location'] = ''; + continue; } - foreach ((array)$Locations as &$Location) { + foreach ((array)self::getClass('LocationManager') + ->find(array('id' => $Locations)) as &$Location + ) { $arguments['data'][$i]['location'] = $Location - ->getLocation() ->get('name'); unset($Location); } diff --git a/packages/web/lib/plugins/location/hooks/changeitems.hook.php b/packages/web/lib/plugins/location/hooks/changeitems.hook.php index 7190c90ed1..0e597f09f4 100644 --- a/packages/web/lib/plugins/location/hooks/changeitems.hook.php +++ b/packages/web/lib/plugins/location/hooks/changeitems.hook.php @@ -67,11 +67,17 @@ public function storageNodeSetting($arguments) 'hostID' => $arguments['Host']->get('id') ) ); + $Locations = self::getSubObjectIDs( + 'LocationAssociation', + array( + 'hostID' => $arguments['Host']->get('id') + ), + 'locationID' + ); $method = false; - foreach ((array)$Locations as $Location) { - if (!$Location->isValid()) { - continue; - } + foreach ((array)self::getClass('LocationManager') + ->find(array('id' => $Locations)) as $Location + ) { $Host =& $arguments['Host']; $Task = $Host->get('task'); $TaskType =& $arguments['TaskType']; @@ -88,7 +94,6 @@ public function storageNodeSetting($arguments) $method = 'getMasterStorageNode'; } $StorageGroup = $Location - ->getLocation() ->getStorageGroup(); if ($StorageGroup->isValid()) { if (!isset($arguments['snapin']) @@ -96,14 +101,12 @@ public function storageNodeSetting($arguments) && self::getSetting('FOG_SNAPIN_LOCATION_SEND_ENABLED') > 0) ) { $arguments['StorageNode'] = $Location - ->getLocation() ->getStorageNode(); } if (!$method) { continue; } $arguments['StorageNode'] = $Location - ->getLocation() ->getStorageGroup() ->{$method}(); } @@ -125,17 +128,17 @@ public function storageGroupSetting($arguments) if (!$arguments['Host']->isValid()) { return; } - $Locations = self::getClass('LocationAssociationManager')->find( + $Locations = self::getSubObjectIDs( + 'LocationAssociation', array( 'hostID' => $arguments['Host']->get('id') - ) + ), + 'locationID' ); - foreach ((array)$Locations as &$Location) { - if (!$Location->isValid()) { - continue; - } + foreach ((array)self::getClass('LocationManager') + ->find(array('id' => $Locations)) as &$Location + ) { $StorageGroup = $Location - ->getLocation() ->getStorageGroup(); if (!$StorageGroup->isValid()) { continue; @@ -159,20 +162,20 @@ public function bootItemSettings($arguments) if (!$arguments['Host']->isValid()) { return; } - $Locations = self::getClass('LocationAssociationManager')->find( + $Locations = self::getSubObjectIDs( + 'LocationAssociation', array( 'hostID' => $arguments['Host']->get('id') - ) + ), + 'locationID' ); - foreach ((array)$Locations as $Location) { - if (!$Location->isValid()) { - continue; - } + foreach ((array)self::getClass('LocationManager') + ->find(array('id' => $Locations)) as $Location + ) { if (!$Location->isTFTP()) { continue; } $StorageNode = $Location - ->getLocation() ->getStorageNode(); if (!$StorageNode->isValid()) { continue; diff --git a/packages/web/lib/plugins/pushbullet/class/pushbulletextends.class.php b/packages/web/lib/plugins/pushbullet/class/pushbulletextends.class.php index 1418cd1ca2..114ea7fe43 100644 --- a/packages/web/lib/plugins/pushbullet/class/pushbulletextends.class.php +++ b/packages/web/lib/plugins/pushbullet/class/pushbulletextends.class.php @@ -103,11 +103,9 @@ public function __construct() public function onEvent($event, $data) { self::$elements = $data; - $objects = self::getClass('PushbulletManager') - ->find(); array_map( self::$eventloop, - (array)$objects + (array)self::getClass('PushbulletManager')->find() ); } } 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 ef4a0edd6c..1ac39394b2 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 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: fog-project-2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-02 13:15-0500\n" +"POT-Creation-Date: 2017-01-02 14:47-0500\n" "PO-Revision-Date: 2016-05-23 07:36-0400\n" "Last-Translator: vspushbullet \n" "Language-Team: German\n" @@ -5176,7 +5176,7 @@ msgstr "Host-Beschreibung" #: /var/www/fog/lib/pages/hostmanagementpage.class.php:398 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:768 -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:149 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:160 msgid "Host Product Key" msgstr "Host-Produkt-Schlüssel" @@ -6255,7 +6255,7 @@ msgstr "" msgid "Location/Deployed" msgstr "Lage/bereitgestellt" -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:151 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:162 msgid "Host Location" msgstr "Host-Standort" 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 9b2ff590fe..87489bb728 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 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-02 13:15-0500\n" +"POT-Creation-Date: 2017-01-02 14:47-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -5159,7 +5159,7 @@ msgstr "Host Description" #: /var/www/fog/lib/pages/hostmanagementpage.class.php:398 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:768 -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:149 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:160 msgid "Host Product Key" msgstr "Host Product Key" @@ -6231,7 +6231,7 @@ msgstr "" msgid "Location/Deployed" msgstr "Location/Deployed" -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:151 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:162 msgid "Host Location" msgstr "Host Location" 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 cdc6be69e3..cfbdc07100 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 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-02 13:15-0500\n" +"POT-Creation-Date: 2017-01-02 14:47-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -5174,7 +5174,7 @@ msgstr "Descripción de acogida" #: /var/www/fog/lib/pages/hostmanagementpage.class.php:398 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:768 -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:149 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:160 msgid "Host Product Key" msgstr "Anfitrión clave de producto" @@ -6249,7 +6249,7 @@ msgstr "" msgid "Location/Deployed" msgstr "Ubicación / Desplegado" -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:151 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:162 msgid "Host Location" msgstr "Lugar de acogida" 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 dca133c8b3..050994ae32 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 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-02 13:15-0500\n" +"POT-Creation-Date: 2017-01-02 14:47-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -5180,7 +5180,7 @@ msgstr "hôte description de" #: /var/www/fog/lib/pages/hostmanagementpage.class.php:398 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:768 -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:149 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:160 msgid "Host Product Key" msgstr "Hôte clé de produit" @@ -6256,7 +6256,7 @@ msgstr "" msgid "Location/Deployed" msgstr "Lieu / Déployé" -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:151 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:162 msgid "Host Location" msgstr "hôte Lieu" 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 3c294edc1d..f6dbd87d5c 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 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-02 13:15-0500\n" +"POT-Creation-Date: 2017-01-02 14:47-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -5167,7 +5167,7 @@ msgstr "Host Descrizione" #: /var/www/fog/lib/pages/hostmanagementpage.class.php:398 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:768 -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:149 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:160 msgid "Host Product Key" msgstr "Host Product Key" @@ -6242,7 +6242,7 @@ msgstr "" msgid "Location/Deployed" msgstr "Posizione / Schierato" -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:151 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:162 msgid "Host Location" msgstr "Host Località" diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot index 9984ccd405..1504b3639a 100644 --- a/packages/web/management/languages/messages.pot +++ b/packages/web/management/languages/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-02 13:16-0500\n" +"POT-Creation-Date: 2017-01-02 14:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4950,7 +4950,7 @@ msgstr "" #: /var/www/fog/lib/pages/hostmanagementpage.class.php:398 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:768 -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:149 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:160 msgid "Host Product Key" msgstr "" @@ -5962,7 +5962,7 @@ msgstr "" msgid "Location/Deployed" msgstr "" -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:151 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:162 msgid "Host Location" 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 345ebe1aa2..df29adb3db 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 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-02 13:15-0500\n" +"POT-Creation-Date: 2017-01-02 14:47-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -5165,7 +5165,7 @@ msgstr "anfitrião Descrição" #: /var/www/fog/lib/pages/hostmanagementpage.class.php:398 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:768 -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:149 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:160 msgid "Host Product Key" msgstr "Hospedar de Chave de Produto" @@ -6236,7 +6236,7 @@ msgstr "" msgid "Location/Deployed" msgstr "Localização / Implantado" -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:151 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:162 msgid "Host Location" msgstr "anfitrião Localização" 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 b2f26cd13b..5dda527223 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 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-02 13:15-0500\n" +"POT-Creation-Date: 2017-01-02 14:47-0500\n" "PO-Revision-Date: 2016-05-22 15:14-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -5146,7 +5146,7 @@ msgstr "主机描述" #: /var/www/fog/lib/pages/hostmanagementpage.class.php:398 #: /var/www/fog/lib/pages/hostmanagementpage.class.php:768 -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:149 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:160 msgid "Host Product Key" msgstr "主机产品密钥" @@ -6211,7 +6211,7 @@ msgstr "" msgid "Location/Deployed" msgstr "位置/部署" -#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:151 +#: /var/www/fog/lib/plugins/location/hooks/addlocationhost.hook.php:162 msgid "Host Location" msgstr "主机位置"