Unverified Commit 52e49ec1 authored by Charlène Auger's avatar Charlène Auger Committed by GitHub
Browse files

Revert "Typo changes"

parent 3261d4c5
......@@ -21,18 +21,18 @@
5. Push to the branch: `git push origin my-new-feature`
6. Submit a pull request !
## Pull Request Information
## Pull Request Informations
When contributing, please open an issue before or contact the team using mail. This will prevent all the duplicate of work.
Also, check if your contribution is not already in the roadmap or affiliated to an issue.
If you are contributing on a small scale (translation, a few line modification), you don't need open an issue or contact the team but you will need to explain what you've done in the Pull Request comment and provide as accurate commit messages as possible.
Cf. Commits Messages Name Information
Cf. Commits Messages Name Informations
If you need to discuss about a big change or need some help of our team during the development of your contribution,
we can use other communication method like Telegram, IRC, Skype.
## Commits Messages Name Information
## Commits Messages Name Informations
Try to create as accurate as possible commit messages.
This will help us to speed up the review process and to reduce the misunderstanding (which can lead to a Pull Request to be rejected)
......
*It's hard to solve a problem when important details are missing, that why we added this template, to help you and us.*
### General information
### General informations
Operating system :
### OCS Inventory information
### OCS Inventory informations
Windows agent version :
### Problem's description
......
......@@ -20,10 +20,10 @@ Put here all the related issues link
## Test environment
If some tests has been already made, please give us your test environment' specs
#### General information
#### General informations
Operating system :
#### OCS Inventory information
#### OCS Inventory informations
Windows agent version :
## Deploy Notes
......
......@@ -360,7 +360,7 @@ BOOL CCapDownload::checkOcsAgentSetupResult()
COptDownloadPackage::cleanAll();
return FALSE;
}
// All information available => copy result file to Package directory
// All informations available => copy result file to Package directory
csFile.Format(_T("%s\\%s\\%s"), getDownloadFolder(), csID, OCS_DOWNLOAD_DONE);
if (!CopyFile(myFile.GetFilePath(), csFile, FALSE))
{
......
......@@ -28,7 +28,7 @@ public: // Methods
CCapDownload();
virtual ~CCapDownload();
// Get download package information from server
// Get download package informations from server
BOOL retrievePackages();
// Write download tool general configuration parameters
BOOL writeConfig();
......@@ -36,7 +36,7 @@ public: // Methods
BOOL launch();
// Check for OCSNG Windows Agent Setup execution result, and send result to server if found
// This is a special work because OCS Agent Setup kill download process. So we lose package info
// This is a special work because OCS Agent Setup kill download process. So we loose package infos
// such as package ID and temporary unzip folder. As a workaround, Agent setup create a result file
// OCSNG-Windows-Agent-Setup_done into Agent's download folder to store package ID and result.
// We have to read this file if exists, and send result message to server.
......
......@@ -312,7 +312,7 @@ void CCapSnmp::PrinterModule(CString Community, CString IP, CMarkup *Xml){
CExecCommand cmProcess;
CString csCmd;
// Printer basic information
// Printer basics informations
CStringArray printer_oids;
printer_oids.Add(_T("1.3.6.1.2.1.43.5.1.1.16.1"));
printer_oids.Add(_T("1.3.6.1.2.1.43.5.1.1.17.1"));
......@@ -434,7 +434,7 @@ void CCapSnmp::TraysModule(CString Community, CString IP, CMarkup *Xml){
CString csCmd;
std::string line;
// trayinfo
// trayinfos
CStringArray trays_oids;
trays_oids.Add(_T("1.3.6.1.2.1.43.8.2.1.13"));
trays_oids.Add(_T("1.3.6.1.2.1.43.8.2.1.18"));
......@@ -487,7 +487,7 @@ void CCapSnmp::CartridgesModule(CString Community, CString IP, CMarkup *Xml){
CString csCmd;
std::string line;
// trayinfo
// trayinfos
CStringArray cartridges_oids;
cartridges_oids.Add(_T("1.3.6.1.2.1.43.11.1.1.6"));
cartridges_oids.Add(_T("1.3.6.1.2.1.43.11.1.1.5"));
......@@ -600,7 +600,7 @@ void CCapSnmp::ScanPhysicalModule(CString Community, CString IP, CMarkup *Xml, C
CString csCmd;
std::string line;
// trayinfo
// trayinfos
CStringArray phys_oids;
phys_oids.Add(_T("1.3.6.1.2.1.47.1.1.1.1.2."));
phys_oids.Add(_T("1.3.6.1.2.1.47.1.1.1.1.7."));
......
......@@ -605,7 +605,7 @@ BOOL COCSInventoryApp::InitInstance()
{
m_pLogger->log( LOG_PRIORITY_NOTICE, _T( "AGENT => Communication Server asked for Package Download"));
// Check if OCS Agent Setup was previously downloaded and run
// This is a special work because OCS Agent Setup kill download process. So we lose package info
// This is a special work because OCS Agent Setup kill download process. So we loose package infos
// such as package ID and temporary unzip folder. As a workaround, Agent setup create a result file
// OCSNG-Windows-Agent-Setup_done into Agent's download folder to store package ID and result.
// We have to read this file if exists, and move result file to package directory
......
......@@ -77,7 +77,7 @@
* Better handling of potentially not well formatted data, to avoid application crash
2.1.0.2
* Add detection of Smartcard readers as input devices
* Update XSL to display CPU table into systray applet "show computer information"
* Update XSL to display CPU table into systray applet "show computer informations"
* Fix bug #980740 : try to UTF-8 encode VBS output if XML loading fails, then try to reload XML
* Fix bug #820218: Truncate out of bound characters in adapter description
* Fix bug #1252671: Unhandled mismatch when OcsLogon.exe launcher looks for the installed OCS Agent through Active Directory GPO
......@@ -99,14 +99,14 @@
* Fix bug #1104071: use WMI to query memory bank if DMI fails
* Fix bug #1079151: unregister old agent 1.X service (instead of only stopping it) before installling new agent 2.X service.
* Add ability to run command after package execution, like REBOOT, SHUTDOWN...
* Add CPU Socket and CPU status information
* Add CPU Socket and CPU status informations
* Add agent ability to force package reinstall, and support for package setup schedule
* Fix bug #1086324: download.exe crashes when NOTIFY_TIMEOUT is not set. So ensure value is provided
* Fix bug #1086972: Windows Agent 2.0.5.3 does not inventory any BIOS information - 2.0.5.2 does
* Include latest list of PNPID vendors, for EDID monitors (see http://www.vesa.org/vesa-standards/standards-faq/))
* Allow using HTML formatting for deployment notification, pre and post package execution
* Workaround bug #1048955: Restrict German language to German/Germany locale
* Fix bug #1034821: Also compute checksum for plugin output, to allow detecting changes when plugin update standard inventory information like software
* Fix bug #1034821: Also compute checksum for plugin output, to allow detecting changes when plugin update standard inventory informations like software
* Try to utf-8 encode VBS or EXE plugin output if XML parsing fails, then try again to parse
* Fix bug #1049864: When agent load configuration, it now really uses authRequired and proxyauthRequired values, and not set them to FALSE by default
* Fix bug #1045784: Ensure timestamp exists before verify expiration
......@@ -164,7 +164,7 @@
2.0.2, aka 2.0.2.0
* Fix Bug #872768: Crash in Registry.cpp - "Run-Time Check Failure #2 - Stack around the variable 'lpstrData' was corrupted."
* Ensure all array and objects are correctly freed
* Fix Bug #859574: Switch to WMI to retrieve Bios info even if DMI access is successful, but serial or model is not valid
* Fix Bug #859574: Switch to WMI to retrieve Bios infos even if DMI access is successful, but serial or model is not valid
* Fix Bug #435068: Do not register multiple time a monitor with the same serial
* Fix Bug #860466: Propagate inherited permissions from $AppData\OCS Inventory NG\Agent to Download directory
2.0.1, aka 2.0.1.0
......@@ -202,7 +202,7 @@
* Fix memory leak bug #765893 in service
* Delete Ocs_Contact.exe when upgrading from agent 1.x
* Do not start download when agent is launched in NOTIFY mode
* Do use link speed in network adapter hash computation, because with wireless, speed may changes, but not the other info.
* Do use link speed in network adapter hash computation, because with wireless, speed may changes, but not the other infos.
2.0 rc4 aka 2.0.0.16
* Fix bug when using agent 4061 to download and setup agent 2.0
* Fix bug #742372 when writing XML produced by plugins to log. So, changes ExecCommand output grab to Ansi instead of Unicode, and disable printing XML
......@@ -234,7 +234,7 @@
* Replace N/A default value by empty string
* Allow CA Bundle using relative path to OCS data folder
* Upgrade libcurl to 7.21.3
* Bug #704043:Ensure setup only runs on Windows 2000 and higher, and use G�nter Knauf libcurl 7.21.3 binary distribution for Windows 2000 target only.
* Bug #704043:Ensure setup only runs on Windows 2000 and higher, and use Günter Knauf libcurl 7.21.3 binary distribution for Windows 2000 target only.
* Fix setup bug when agent series 4000 installed, but never launched (no data file)
* Fix encryption/decryption methods, not really working before :(
* Fix bug appending plugin XML to the inventory XML
......
......@@ -43,9 +43,9 @@ public: // Methods
// Standard destructor
virtual ~CHTTPConfig();
// Reset default values
void Clear();
// Reset default values
void Clear();
// Load configuration from specified file (default agent config used if NULL)
// Use specified section (Communication server used if NULL)
BOOL load( LPCTSTR lpstrFile = NULL, LPCTSTR lpstrSection = OCS_HTTP_PROVIDER_SECTION);
......@@ -100,7 +100,7 @@ public: // Methods
LPCTSTR getProxy();
// Return the proxy port
UINT getProxyPort();
// Set proxy information
// Set proxy informations
void setProxyType( UINT uProxyType = OCS_HTTP_PROXY_TYPE_HTTP);
void setProxy( LPCTSTR lpstrServerName);
void setProxyPort( UINT uPort = OCS_HTTP_DEFAULT_PORT);
......
This version of the agent windows is totally experimental, USE IT AT YOUR OWN RISK.
This version of the agent windows is totaly experimental, USE IT AT YOUR OWN RISK.
Even if a lot of tests have been performed on this version some things can be buggy or some lack of functionality.
This version can be driven by the community. If you want to help us improve this version don't hesitate and send a message to contact@ocsinventory-ng.org or with git hub issue system.
This version can be driven by the community if you want to help us improve this version don't hesitate and send a message to contact@ocsinventory-ng.org or with git hub issue system.
......@@ -30,7 +30,7 @@
</head>
<body>
<div align="center">
<H1> OCS Inventory NG Information for Computer<br />
<H1> OCS Inventory NG Informations for Computer<br />
<xsl:value-of select="CONTENT/HARDWARE/NAME"/>
</H1>
<hr/>
......
......@@ -135,7 +135,7 @@ public: // Methods
void setForceInventoryRequired( BOOL bForce = TRUE);
// Does we have to generate a new Device Unique ID (/UID)
void setNewUID( BOOL bNew = TRUE);
// Enable agent to notify inventory change of important information
// Enable agent to notify inventory change of important informations
void setNotify( BOOL bNotify = FALSE);
// Set if IpDiscover force for network with /IPDISC:network
void setIpDiscoverRequired(LPCTSTR lpstrNetwork = NULL);
......
//====================================================================================
// Open Computer and Software Inventory Next Generation
// Copyright (C) 2010 OCS Inventory NG Team. All rights reserved.
// Web: http://www.ocsinventory-ng.org
// This code is open source and may be copied and modified as long as the source
// code is always made freely available.
// Please refer to the General Public Licence V2 http://www.gnu.org/ or Licence.txt
//====================================================================================
//====================================================================================
// Open Computer and Software Inventory Next Generation
// Copyright (C) 2010 OCS Inventory NG Team. All rights reserved.
// Web: http://www.ocsinventory-ng.org
// This code is open source and may be copied and modified as long as the source
// code is always made freely available.
// Please refer to the General Public Licence V2 http://www.gnu.org/ or Licence.txt
//====================================================================================
// DownloadRequest.h: interface for the CDownloadRequest class.
//
//////////////////////////////////////////////////////////////////////
......@@ -29,7 +29,7 @@ public:
// Do some action when request successfully executed
void setSuccess();
// Set package execution result code and optionally command ouput
// Set package execution result code and optionnally command ouput
BOOL setPackageResult( LPCTSTR lpstrPackID, LPCTSTR lpstrCode, LPCTSTR lpstrOutput = NULL);
};
......
......@@ -73,7 +73,7 @@ public:
/**
* Exec command in the directory path. Make sure that the
* executable is either in the path or specify the full path.
* Wait for command AND ALL other threads/processes it may launch to finish.
* Wait for command AND ALL others threads/processes it may launch to finish.
* In this case, we try get exit code, but NOT stdout and stderr
* Return EXEC_SUCCESSFULL if all successful
* EXEC_ERROR_START_COMMAND if start command error
......
......@@ -117,7 +117,7 @@ BOOL CInventoryRequest::final()
if (m_bNotify)
{
// Notify mode => Only send minimum network information
// Notify mode => Only send minimum network informations
getXmlPointerRequest();
// Save inventory state only for Network adapters
m_pState->SetNetworks( m_NetworkList.GetHash());
......@@ -193,7 +193,7 @@ BOOL CInventoryRequest::final()
// Update Registry values
bSuccess = bSuccess && m_pTheDB->UpdateRegistryValues( m_RegistryList);
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update %u Registry Value(s)"), m_RegistryList.GetCount());
// Update Administrative Information
// Update Administrative Informations
csFilename.Format( _T("%s\\%s"), getDataFolder(), OCS_ACCOUNTINFO_FILENAME);
bSuccess = bSuccess && m_pTheDB->UpdateAccountInfo( csFilename);
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => XML Update Administrative Information(s)"));
......@@ -237,13 +237,13 @@ BOOL CInventoryRequest::isStateChanged()
{
CString csHash, csPlugHash;
ULONG ulChecksum = 0;
// BIOS information from EXE/VBS plugin
// BIOS informations from EXE/VBS plugin
CBios m_plugBIOS;
// List of CPU info from EXE/VBS plugin
// List of CPU infos from EXE/VBS plugin
CCpuList m_plugCpuList;
// List of Input devices info from EXE/VBS plugin
// List of Input devices infos from EXE/VBS plugin
CInputDeviceList m_plugInputList;
// List of Logical Drives (Volume name, File system, Total size, Free space...) from EXE/VBS plugin
// List of Logical Drives (Volum name, File system, Total size, Free space...) from EXE/VBS plugin
CLogicalDriveList m_plugDriveList;
// List of Memory slots from EXE/VBS plugin
CMemorySlotList m_plugMemoryList;
......@@ -255,7 +255,7 @@ BOOL CInventoryRequest::isStateChanged()
CNetworkAdapterList m_plugNetworkList;
// List of Printers from EXE/VBS plugin
CPrinterList m_plugPrinterList;
// List of Device registry values info from EXE/VBS plugin
// List of Device registry values infos from EXE/VBS plugin
CRegistryValueList m_plugRegistryList;
// List of Software from EXE/VBS plugin
CSoftwareList m_plugSoftwareList;
......@@ -263,7 +263,7 @@ BOOL CInventoryRequest::isStateChanged()
CSoundDeviceList m_plugSoundList;
// List of Storage devices (Floppy disk, IDE Disk, SCSI Disk, CD-Rom...) from EXE/VBS plugin
CStoragePeripheralList m_plugStorageList;
// List of System Controllers (Floppy, IDE, SCSI, USB, IEEE1394, PCMCIA, SATA) from EXE/VBS plugin
// List of System Controlers (Floppy, IDE, SCSI, USB, IEEE1394, PCMCIA, SATA) from EXE/VBS plugin
CSystemControllerList m_plugSystemControllerList;
// List of System Slots (PCI, AGP...) from EXE/VBS plugin
CSystemSlotList m_plugSlotList;
......@@ -629,7 +629,7 @@ BOOL CInventoryRequest::runInventory()
// Last logged on user
m_pSysInfo->getLastLoggedUser( cs1);
m_Device.SetLastLoggedUser( cs1);
// Get OS information and device type (windows station or windows server)
// Get OS informations and device type (windows station or windows server)
if (!m_pSysInfo->getOS( cs1, cs2, cs3, cs4, cs5))
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve Operating System"));
else
......@@ -661,7 +661,7 @@ BOOL CInventoryRequest::runInventory()
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => User domain is <%s>"),
cs1);
m_Device.SetUserDomain( cs1);
// Get BIOS information
// Get BIOS informations
if (!m_pSysInfo->getBiosInfo( &m_BIOS))
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve BIOS"));
else
......@@ -669,16 +669,16 @@ BOOL CInventoryRequest::runInventory()
m_BIOS.GetSystemManufacturer(), m_BIOS.GetSystemModel(), m_BIOS.GetSystemSerialNumber(),
m_BIOS.GetBiosManufacturer(), m_BIOS.GetBiosDate(), m_BIOS.GetBiosVersion(),
m_BIOS.GetMotherboardManufacturer(), m_BIOS.GetMotherboardModel(), m_BIOS.GetMotherboardSerialNumber());
// Get Processor info (0 means error)
// Get Processor infos (0 means error)
if (!(dwValue = m_pSysInfo->getProcessors( cs1, cs2, &m_CpuList)))
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve processor(s)"));
else
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %lu processor(s) %s at %s MHz"),
dwValue, cs1, cs2);
m_Device.SetProcessor( cs1, cs2, dwValue);
// Get memory information
// Get memory informations
if (!m_pSysInfo->getMemory( &ulPhysicalMemory, &ulSwapSize))
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve memory information from OS"));
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve memory informations from OS"));
else
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => OS Memory %lu MB, OS Swap size %lu MB"),
ulPhysicalMemory, ulSwapSize);
......@@ -706,9 +706,9 @@ BOOL CInventoryRequest::runInventory()
else
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d system slot(s) found"),
m_SlotList.GetCount());
// Get System controllers
// Get System controlers
if (!m_pSysInfo->getSystemControllers( &m_SystemControllerList))
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve system controllers"));
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve system controlers"));
else
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d system controller(s) found"),
m_SystemControllerList.GetCount());
......@@ -733,19 +733,19 @@ BOOL CInventoryRequest::runInventory()
else
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d modem(s) found"),
m_ModemList.GetCount());
// Get network adapter(s) hardware and IP information
// Get network adapter(s) hardware and IP informations
if (!m_pSysInfo->getNetworkAdapters( &m_NetworkList))
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve network adapters"));
else
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d network adapter(s) found"),
m_NetworkList.GetCount());
// Get Printer(s) information
// Get Printer(s) informations
if (!m_pSysInfo->getPrinters( &m_PrinterList))
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve system printers"));
else
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => %d system printer(s) found"),
m_PrinterList.GetCount());
// Get Video adapter(s) information
// Get Video adapter(s) informations
if (!m_pSysInfo->getVideoAdapters( &m_VideoList))
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve video adapters"));
else
......@@ -760,7 +760,7 @@ BOOL CInventoryRequest::runInventory()
m_Device.SetIPAddress( m_pSysInfo->getLocalIP());
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => Default IPv4 address is <%s>"),
m_Device.GetIPAddress());
// Get Windows registration info
// Get Windows registration infos
if (!m_pSysInfo->getWindowsRegistration( cs1, cs2, cs3))
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve system registration"));
else
......@@ -865,7 +865,7 @@ LONG CInventoryRequest::SearchFilesInDirectory(LPCTSTR lpstrDir, LPCTSTR lpstrEx
{
// This is an apps to search
if (!getFileVersion( cFinder.GetFilePath(), csPublisher, csName, csVersion, csComment, csLanguage))
// Unable to get version info => use filename
// Unable to get version infos => use filename
csName = cFinder.GetFileName();
StrForSQL( csName);
if (csName.IsEmpty())
......
......@@ -30,7 +30,7 @@ class OCSINVENTORYFRONT_API CInventoryRequest : public CRequestAbstract
public: //Methods
//Standards constructor and destructor
// Optionally, enable notify mode to send only important information changes, such as IP information
// Optionnally, enable notify mode to send only important informations changes, such as IP informations
CInventoryRequest( BOOL bNotify = FALSE);
virtual ~CInventoryRequest();
......@@ -45,13 +45,13 @@ public: //Attributes
CXMLInteract *m_pTheDB;
// General device properties
CDeviceProperties m_Device;
// BIOS information
// BIOS informations
CBios m_BIOS;
// List of CPU info
// List of CPU infos
CCpuList m_CpuList;
// List of Input devices info
// List of Input devices infos
CInputDeviceList m_InputList;
// List of Logical Drives (Volume name, File system, Total size, Free space...)
// List of Logical Drives (Volum name, File system, Total size, Free space...)
CLogicalDriveList m_DriveList;
// List of Memory slots
CMemorySlotList m_MemoryList;
......@@ -63,7 +63,7 @@ public: //Attributes
CNetworkAdapterList m_NetworkList;
// List of Printers
CPrinterList m_PrinterList;
// List of Device registry values info
// List of Device registry values infos
CRegistryValueList m_RegistryList;
// List of Software
CSoftwareList m_SoftwareList;
......@@ -71,7 +71,7 @@ public: //Attributes
CSoundDeviceList m_SoundList;
// List of Storage devices (Floppy disk, IDE Disk, SCSI Disk, CD-Rom...)
CStoragePeripheralList m_StorageList;
// List of System Controllers (Floppy, IDE, SCSI, USB, IEEE1394, PCMCIA, SATA)
// List of System Controlers (Floppy, IDE, SCSI, USB, IEEE1394, PCMCIA, SATA)
CSystemControllerList m_SystemControllerList;
// List of System Slots (PCI, AGP...)
CSystemSlotList m_SlotList;
......
......@@ -15,11 +15,11 @@
#include "stdafx.h"
#include "InventoryResponse.h"
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
......@@ -32,7 +32,7 @@ CInventoryResponse::CInventoryResponse(CByteArray *rawResponse) : CResponseAbstr
CString csName, csValue;
TiXmlElement *pXmlReply, *pXmlAccount, *pXmlElement;
// Parse Account Info updates
// Parse Account Infos updates
m_cmXml.ResetPos();
if (pXmlReply = m_cmXml.FindFirstElem( _T( "REPLY")))
{
......@@ -45,9 +45,9 @@ CInventoryResponse::CInventoryResponse(CByteArray *rawResponse) : CResponseAbstr
pXmlElement = m_cmXml.FindFirstElem( _T( "KEYVALUE"), pXmlAccount);
csValue = m_cmXml.GetData( pXmlElement);
if (getAgentConfig()->writeAccountInfos( csName, csValue))
pLogger->log( LOG_PRIORITY_NOTICE, _T( "ADMIN INFO => Couple ( %s <=> %s ) added to configuration file"), csName, csValue);
pLogger->log( LOG_PRIORITY_NOTICE, _T( "ADMIN INFOS => Couple ( %s <=> %s ) added to configuration file"), csName, csValue);
else
pLogger->log( LOG_PRIORITY_ERROR, _T( "ADMIN INFO => Failed to add couple ( %s <=> %s ) to configuration file <%s>"), csName, csValue, LookupError( GetLastError()));
pLogger->log( LOG_PRIORITY_ERROR, _T( "ADMIN INFOS => Failed to add couple ( %s <=> %s ) to configuration file <%s>"), csName, csValue, LookupError( GetLastError()));
// Search next ACCOUNTINFO node
pXmlAccount = m_cmXml.FindNextElem( _T( "ACCOUNTINFO"), pXmlAccount);
}
......
......@@ -44,14 +44,14 @@
#define OCS_CHECKSUM_SOUNDS 16384
#define OCS_CHECKSUM_VIDEOS 32768
#define OCS_CHECKSUM_SOFTWARES 65536
#define OCS_CHECKSUM_VIRTUALMACHINES 131072
#define OCS_CHECKSUM_CPUS 262144
#define OCS_CHECKSUM_VIRTUALMACHINES 131072
#define OCS_CHECKSUM_CPUS 262144
class OCSINVENTORYFRONT_API COCSInventoryState
{
public: // Methods
//////////////////////////////////
// Standard constructor/destructor
// Standard contructor/destructor
//////////////////////////////////
COCSInventoryState();
virtual ~COCSInventoryState();
......@@ -83,7 +83,7 @@ public: // Methods
// Set attributes values
//////////////////////////////////
// Clear info
// Clear infos
void Clear();
void SetHardware( LPCTSTR lpstrValue);
......@@ -114,9 +114,9 @@ public: // Methods
BOOL WriteToFile( LPCTSTR lpstrFilename, LPCTSTR lpstrSection = OCS_STATE_STANDARD_SECTION);
protected: // Methods
// Format information in a XML string
// Format informations in a XML string
BOOL FormatXML( CMarkup* pXml, LPCTSTR lpstrSection = OCS_STATE_STANDARD_SECTION);
// Read information in a XML string
// Read informations in a XML string
BOOL ParseFromXML( CMarkup* pXml, LPCTSTR lpstrSection = OCS_STATE_STANDARD_SECTION);
protected: // Attributes
......
......@@ -922,11 +922,11 @@ BOOL CXMLInteract::UpdateAccountInfo( LPCTSTR lpstrAccountFile)
{
// Get size of Admininfo.conf file
if (!fileExists( lpstrAccountFile))
// If admin file does not exist, return TRUE because assuming first run or no admin info
// If admin file does not exist, return TRUE because assuming first run or no admin infos
return TRUE;
if (!myXmlAccount.LoadFile( lpstrAccountFile))
{
// Old format admin info file ???
// Old format admin infos file ???
if (UpdateAccountInfoOldFormat( &myXmlAccount, lpstrAccountFile))
{
// Yes, so save in new format
......
......@@ -11,7 +11,7 @@
// XMLInteract.h: interface for the CXMLInteract class.
//
// Storage class using CStdioFile class to load from and store
// information to XML.
// informations to XML.
//
//////////////////////////////////////////////////////////////////////
......@@ -29,7 +29,7 @@ class CXMLInteract
{
public: // Methods
//////////////////////////////////
// Standard constructor/destructor
// Standard contructor/destructor
//////////////////////////////////
CXMLInteract(){};
CXMLInteract( CMarkup* );
......@@ -116,12 +116,12 @@ public: // Methods
// Return TRUE if they are successfully updated
BOOL ReadVideos( CVideoAdapterList &myVideoList);
BOOL UpdateVideos( CVideoAdapterList &myVideoList);
// Write Administrative information from file in XML document
// Write Administrative informations from file in XML document
// Return TRUE if they are successfully updated
BOOL UpdateAccountInfo( LPCTSTR lpstrAccountFile);
protected: // Methods
// Read Administrative information from old INI format and add them to XML
// Read Administrative informations from old INI format and add them to XML
BOOL UpdateAccountInfoOldFormat( CMarkup *pXml, LPCTSTR lpstrAccountFile);
protected: // Attributes
CMarkup *m_pXml; // Pointer to xml of the inventory
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment