* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */
Info
Revision:3402
Author:victor
Date:2008-08-01 16:12:47 +0300 (Fri, 01 Aug 2008)
Comment:minor fixes in SMTP code; implemented map positioning on changed object
Changes
U trunk/ChangeLog
U trunk/src/agent/subagents/portCheck/smtp.cpp
U trunk/src/console/win32/MapFrame.cpp
U trunk/src/console/win32/MapFrame.h
U trunk/src/console/win32/MapView.cpp
U trunk/src/console/win32/MapView.h
U trunk/src/console/win32/nxcon.clw
U trunk/src/console/win32/nxcon.rc
U trunk/src/console/win32/resource.h
U trunk/src/server/core/email.cpp
Diff
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-08-01 07:22:50 UTC (rev 3401)
+++ trunk/ChangeLog 2008-08-01 13:12:47 UTC (rev 3402)
@@ -7,6 +7,7 @@
via $node variable and to event properties via $event variable
- Implemented XML encoding for NXCP messages
- Added support of custom object attributes
+- Minor map improvements
- Fixed issues: #196, #201, #216, #220, #221, #222, #225, #226, #230, #231
Modified: trunk/src/agent/subagents/portCheck/smtp.cpp
===================================================================
--- trunk/src/agent/subagents/portCheck/smtp.cpp 2008-08-01 07:22:50 UTC (rev 3401)
+++ trunk/src/agent/subagents/portCheck/smtp.cpp 2008-08-01 13:12:47 UTC (rev 3402)
@@ -79,12 +79,12 @@
char szTime[64];
time(&currentTime);
-#ifdef HAVE_GMTIME_R
+#ifdef HAVE_LOCALTIME_R
struct tm currentTM;
- gmtime_r(&currentTime, &currentTM);
+ localtime_r(&currentTime, &currentTM);
pCurrentTM = &currentTM;
#else
- pCurrentTM = gmtime(&currentTime);
+ pCurrentTM = localtime(&currentTime);
#endif
strftime(szTime, sizeof(szTime), "%a, %d %b %Y %H:%M:%S %z\r\n", pCurrentTM);
Modified: trunk/src/console/win32/MapFrame.cpp
===================================================================
--- trunk/src/console/win32/MapFrame.cpp 2008-08-01 07:22:50 UTC (rev 3401)
+++ trunk/src/console/win32/MapFrame.cpp 2008-08-01 13:12:47 UTC (rev 3402)
@@ -39,6 +39,7 @@
theApp.WriteProfileInt(MAP_SECTION, _T("ShowToolBox"), m_bShowToolBox);
theApp.WriteProfileInt(MAP_SECTION, _T("ShowStatusBar"), m_bShowStatusBar);
theApp.WriteProfileInt(MAP_SECTION, _T("ShowConnectorNames"), m_wndMapView.m_bShowConnectorNames);
+ theApp.WriteProfileInt(MAP_SECTION, _T("EnsureChangeVisibility"), m_wndMapView.m_bPositionOnChangedObject);
}
@@ -94,6 +95,8 @@
ON_UPDATE_COMMAND_UI(ID_MAP_UNLINK, OnUpdateMapUnlink)
ON_COMMAND(ID_MAP_SHOWCONNECTORNAMES, OnMapShowconnectornames)
ON_UPDATE_COMMAND_UI(ID_MAP_SHOWCONNECTORNAMES, OnUpdateMapShowconnectornames)
+ ON_COMMAND(ID_MAP_ENSUREVISIBLE, OnMapEnsurevisible)
+ ON_UPDATE_COMMAND_UI(ID_MAP_ENSUREVISIBLE, OnUpdateMapEnsurevisible)
//}}AFX_MSG_MAP
ON_MESSAGE(NXCM_OBJECT_CHANGE, OnObjectChange)
ON_MESSAGE(NXCM_SUBMAP_CHANGE, OnSubmapChange)
@@ -175,6 +178,7 @@
// Create and initialize map view
m_wndMapView.CreateEx(WS_EX_CLIENTEDGE, NULL, _T("MapView"), WS_CHILD | WS_VISIBLE, rect, this, 0);
m_wndMapView.m_bShowConnectorNames = theApp.GetProfileInt(MAP_SECTION, _T("ShowConnectorNames"), FALSE);
+ m_wndMapView.m_bPositionOnChangedObject = theApp.GetProfileInt(MAP_SECTION, _T("EnsureChangeVisibility"), FALSE);
// Select map to open
CMapSelDlg dlg;
@@ -1031,3 +1035,18 @@
{
pCmdUI->SetCheck(m_wndMapView.m_bShowConnectorNames);
}
+
+
+//
+// Enable/disable map positioning on changed objects
+//
+
+void CMapFrame::OnMapEnsurevisible()
+{
+ m_wndMapView.m_bPositionOnChangedObject = !m_wndMapView.m_bPositionOnChangedObject;
+}
+
+void CMapFrame::OnUpdateMapEnsurevisible(CCmdUI* pCmdUI)
+{
+ pCmdUI->SetCheck(m_wndMapView.m_bPositionOnChangedObject);
+}
Modified: trunk/src/console/win32/MapFrame.h
===================================================================
--- trunk/src/console/win32/MapFrame.h 2008-08-01 07:22:50 UTC (rev 3401)
+++ trunk/src/console/win32/MapFrame.h 2008-08-01 13:12:47 UTC (rev 3402)
@@ -104,6 +104,8 @@
afx_msg void OnUpdateMapUnlink(CCmdUI* pCmdUI);
afx_msg void OnMapShowconnectornames();
afx_msg void OnUpdateMapShowconnectornames(CCmdUI* pCmdUI);
+ afx_msg void OnMapEnsurevisible();
+ afx_msg void OnUpdateMapEnsurevisible(CCmdUI* pCmdUI);
//}}AFX_MSG
afx_msg void OnObjectChange(WPARAM wParam, NXC_OBJECT *pObject);
afx_msg void OnSubmapChange(WPARAM wParam, nxSubmap *pSubmap);
Modified: trunk/src/console/win32/MapView.cpp
===================================================================
--- trunk/src/console/win32/MapView.cpp 2008-08-01 07:22:50 UTC (rev 3401)
+++ trunk/src/console/win32/MapView.cpp 2008-08-01 13:12:47 UTC (rev 3402)
@@ -64,6 +64,7 @@
m_bIsModified = FALSE;
m_bCanOpenObjects = TRUE;
m_bShowConnectorNames = FALSE;
+ m_bPositionOnChangedObject = FALSE;
}
CMapView::~CMapView()
@@ -1475,6 +1476,8 @@
m_bIsModified = TRUE;
}
}
+ if (m_bPositionOnChangedObject)
+ EnsureVisible(dwObjectId);
Update();
}
else
@@ -1588,3 +1591,42 @@
{
return m_scaleInfo[m_nScale].nFactor;
}
+
+
+//
+// Ensure object visibility
+//
+
+void CMapView::EnsureVisible(DWORD dwObjectId)
+{
+ RECT rcClient;
+ POINT pos;
+
+ GetClientRect(&rcClient);
+ pos = m_pSubmap->GetObjectPosition(dwObjectId);
+ ScalePosMapToScreen(&pos);
+
+ if (pos.x < m_ptOrg.x)
+ {
+ SetScrollPos(SB_HORZ, pos.x);
+ m_ptOrg.x = pos.x;
+ }
+
+ if (pos.y < m_ptOrg.y)
+ {
+ SetScrollPos(SB_VERT, pos.y);
+ m_ptOrg.y = pos.y;
+ }
+
+ if (pos.x > m_ptOrg.x + rcClient.right - m_scaleInfo[m_nScale].ptObjectSize.x)
+ {
+ SetScrollPos(SB_HORZ, m_ptOrg.x + rcClient.right - m_scaleInfo[m_nScale].ptObjectSize.x);
+ m_ptOrg.x += rcClient.right - m_scaleInfo[m_nScale].ptObjectSize.x;
+ }
+
+ if (pos.y > m_ptOrg.y + rcClient.bottom - m_scaleInfo[m_nScale].ptObjectSize.y)
+ {
+ SetScrollPos(SB_VERT, m_ptOrg.y + rcClient.right - m_scaleInfo[m_nScale].ptObjectSize.y);
+ m_ptOrg.y += rcClient.right - m_scaleInfo[m_nScale].ptObjectSize.y;
+ }
+}
Modified: trunk/src/console/win32/MapView.h
===================================================================
--- trunk/src/console/win32/MapView.h 2008-08-01 07:22:50 UTC (rev 3401)
+++ trunk/src/console/win32/MapView.h 2008-08-01 13:12:47 UTC (rev 3402)
@@ -158,6 +158,8 @@
DECLARE_MESSAGE_MAP()
public:
+ BOOL m_bPositionOnChangedObject;
+ void EnsureVisible(DWORD dwObjectId);
BOOL m_bShowConnectorNames;
BOOL m_bCanOpenObjects;
BOOL m_bIsModified;
Modified: trunk/src/console/win32/nxcon.clw
===================================================================
--- trunk/src/console/win32/nxcon.clw 2008-08-01 07:22:50 UTC (rev 3401)
+++ trunk/src/console/win32/nxcon.clw 2008-08-01 13:12:47 UTC (rev 3402)
@@ -17,20 +17,20 @@
ResourceCount=258
Resource1=IDD_EDIT_TRAP (English (U.S.))
-Resource2=IDD_REQUEST_PROCESSING
+Resource2=IDR_MAINFRAME
Resource3=IDD_EDIT_RULE_SCRIPT (English (U.S.))
-Resource4=IDA_NODE_POLLER
-Resource5=IDD_OBJECT_VPNC_GENERAL
+Resource4=IDD_DISCOVERY_COMMUNITIES
+Resource5=IDD_EDIT_RULE_SEVERITY
Class2=CChildView
Class5=CAboutDlg
Class6=CControlPanel
Class8=CMapFrame
Class10=CLoginDialog
-Resource6=IDD_EDIT_RULE_SEVERITY
+Resource6=IDA_SCRIPT_MANAGER
Class11=CProgressDialog
-Resource7=IDD_DISCOVERY_RANGES
+Resource7=IDD_LASTVAL_PROP
Class12=CAddrEntryDlg
-Resource8=IDD_DCI_THRESHOLDS
+Resource8=IDA_GRAPH
Class13=CObjectPropDlg
Resource9=IDD_ACTION_PROPERTIES (English (U.S.))
Resource10=IDA_AGENT_CFG_EDITOR (English (U.S.))
@@ -46,45 +46,45 @@
Class16=CDebugFrame
Resource18=IDA_EPP (English (U.S.))
Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
-Resource20=IDD_SELECT_ACTION
+Resource20=IDA_NODE_POLLER
Class17=CObjectPreview
Resource21=IDA_TRAP_EDITOR (English (U.S.))
Class18=CToolBox
Class19=CObjectInfoBox
Class20=CObjectSearchBox
-Resource22=IDD_USER_PROPERTIES
+Resource22=IDA_NETMAP
Class21=CEditBox
Class22=COPGeneral
Class23=CNodePropsGeneral
Resource23=IDD_GRAPH_PROPERTIES (English (U.S.))
Class24=CObjectPropCaps
Class25=CObjectPropSheet
-Resource24=IDD_OBJECT_RELATIONS
+Resource24=IDD_DCI_COLLECTION
Class26=CRequestProcessingDlg
Resource25=IDD_CREATE_IF_DCI (English (U.S.))
Resource26=IDD_PROGRESS (English (U.S.))
-Resource27=IDD_SELECT_OBJECT
+Resource27=IDA_SERVER_CFG_EDITOR
Resource28=IDD_THRESHOLD (English (U.S.))
Class27=CObjectPropsGeneral
Resource29=IDD_OBJTOOL_OPTIONS (English (U.S.))
Class28=CObjectPropsSecurity
Resource30=IDD_OBJECT_NETSRV_GENERAL (English (U.S.))
-Resource31=IDD_DATA_QUERY
-Resource32=IDA_AGENT_CFG_EDITOR
+Resource31=IDD_OBJECT_CAPS
+Resource32=IDD_DEFINE_GRAPH
Class29=CUserSelectDlg
-Resource33=IDD_EDIT_RULE_COMMENT
+Resource33=IDA_AGENT_CFG_EDITOR
Class30=CUserEditor
Resource34=IDD_DCI_PROPERTIES
Class31=CNewUserDlg
-Resource35=IDD_INPUT_BOX
-Resource36=IDD_REMOVE_TEMPLATE
+Resource35=IDD_NEW_USER
+Resource36=IDD_CREATE_TG
Class32=CUserPropDlg
Resource37=IDD_SELECT_USER (English (U.S.))
-Resource38=IDD_SELECT_TRAP
+Resource38=IDD_OBJECT_VPNC_GENERAL
Class33=CGroupPropDlg
-Resource39=IDD_CREATE_CONDITION
-Resource40=IDD_ADDR_ENTRY
-Resource41=IDA_MDI_DEFAULT
+Resource39=IDD_SELECT_INTERNAL_ITEM
+Resource40=IDD_DCI_DATA_EXPORT
+Resource41=IDD_DISCOVERY_TARGETS
Resource42=IDD_MIB_BROWSER (English (U.S.))
Class34=CPasswordChangeDlg
Class35=CNodeSummary
@@ -99,56 +99,56 @@
Class41=CGraphFrame
Class42=CDCIThresholdsPage
Resource46=IDD_DISCOVERY_RANGES (English (U.S.))
-Resource47=IDD_EDIT_RULE_SCRIPT
-Resource48=IDD_CHANGE_PASSWORD
+Resource47=IDD_DESKTOP_SAVE_AS
+Resource48=IDD_EDIT_TRAP_ARG
Class43=CThresholdDlg
Resource49=IDD_EDIT_EVENT (English (U.S.))
-Resource50=IDA_OBJECT_TOOLS_EDITOR
+Resource50=IDD_GRAPH_PROP_STYLES
Class44=CMIBBrowserDlg
Class45=CEventPolicyEditor
Class46=CRuleList
Class47=CRuleHeader
Resource51=IDD_OBJECT_IF_GENERAL (English (U.S.))
-Resource52=IDA_OBJECT_COMMENTS
+Resource52=IDD_MAP_LINK
Class48=CObjectSelDlg
-Resource53=IDD_SET_PASSWORD
-Resource54=IDA_TRAP_EDITOR
+Resource53=IDA_ACTION_EDITOR
+Resource54=IDD_CREATE_CLUSTER
Class49=CRuleCommentDlg
-Resource55=IDD_SELECT_INTERNAL_ITEM
+Resource55=IDD_OBJECT_SECURITY
Class50=CEventSelDlg
-Resource56=IDA_OBJECT_BROWSER
+Resource56=IDD_DISCOVERY_RANGES
Resource57=IDD_COND_DCI_PROP (English (U.S.))
-Resource58=IDD_EDIT_TRAP
+Resource58=IDD_REQUEST_PROCESSING
Resource59=IDD_GROUP_PROPERTIES (English (U.S.))
Resource60=IDD_DISCOVERY_GENERAL (English (U.S.))
Class51=CObjectPropsPresentation
Resource61=IDD_SET_PASSWORD (English (U.S.))
-Resource62=IDD_SELECT_AGENT_PARAM
+Resource62=IDD_SELECT_USER
Class52=CRuleSeverityDlg
-Resource63=IDD_OBJECT_NODE_GENERAL
+Resource63=IDD_SELECT_MAP
Class53=CRuleAlarmDlg
Class54=CAlarmBrowser
Resource64=IDD_CHANGE_IP (English (U.S.))
-Resource65=IDD_GRAPH_PROP_DATA
+Resource65=IDD_MIB_BROWSER
Resource66=IDD_DCI_THRESHOLDS (English (U.S.))
Resource67=IDD_GRAPH_PROP_SETTINGS (English (U.S.))
Resource68=IDD_CREATE_VPNC (English (U.S.))
Class55=CConsolePropsGeneral
Class56=CActionEditor
-Resource69=IDD_SELECT_USER
-Resource70=IDD_FATAL_ERROR
+Resource69=IDA_EPP
+Resource70=IDD_NEW_OBJECT_TOOL
Class57=CNewActionDlg
-Resource71=IDD_NEW_USER
+Resource71=IDA_ALARM_BROWSER
Class58=CEditActionDlg
-Resource72=IDA_NETMAP
+Resource72=IDD_SELECT_MP
Class59=CActionSelDlg
-Resource73=IDD_LASTVAL_PROP
+Resource73=IDD_SELECT_OBJECT
Resource74=IDD_OBJECT_COND_SCRIPT (English (U.S.))
Resource75=IDD_EDIT_TRAP_ARG (English (U.S.))
-Resource76=IDD_DCI_TRANSFORM
+Resource76=IDD_ABOUTBOX
Class60=CCreateObjectDlg
Class61=CCreateContainerDlg
-Resource77=IDD_EDIT_EVENT
+Resource77=IDD_OBJECT_TRUSTED_NODES
Class62=CCreateNodeDlg
Resource78=IDA_CERT_MANAGER (English (U.S.))
Resource79=IDT_MAP (English (U.S.))
@@ -158,31 +158,31 @@
Class64=CPollNodeDlg
Resource82=IDD_POLL_NODE (English (U.S.))
Class65=CNodePoller
-Resource83=IDA_LAST_VALUES
-Resource84=IDD_CREATE_IF_DCI
+Resource83=IDD_CLUSTER_RESOURCE
+Resource84=IDD_SUBMAP_BKGND
Class66=CCreateTemplateDlg
Class67=CCreateTGDlg
-Resource85=IDA_DC_EDITOR
-Resource86=IDA_AGENT_CONFIG_MANAGER
+Resource85=IDD_MANAGE_GRAPHS
+Resource86=IDD_CREATE_IF_DCI
Class68=CTrapEditor
-Resource87=IDD_OBJECT_NETSRV_GENERAL
-Resource88=IDD_CREATE_NODE
-Resource89=IDD_MIB_BROWSER
+Resource87=IDD_GROUP_PROPERTIES
+Resource88=IDA_MAP_MANAGER
+Resource89=IDA_LAST_VALUES
Class69=CDataQueryDlg
-Resource90=IDD_DISCOVERY_COMMUNITIES
+Resource90=IDD_OBJECT_COND_GENERAL
Class70=CTrapEditDlg
Resource91=IDD_SET_CHILD_MGMT_STATUS (English (U.S.))
Class71=CTrapParamDlg
-Resource92=IDD_CREATE_VPNC
-Resource93=IDD_DEFINE_GRAPH
+Resource92=IDD_OBJECT_PRESENTATION
+Resource93=IDD_OBJTOOL_OPTIONS
Class72=CGraphPropDlg
Class73=CColorSelector
Class74=CPackageMgr
-Resource94=IDD_GRAPH_PROP_STYLES
+Resource94=IDD_REMOVE_TEMPLATE
Resource95=IDD_IMPORT_CA_CERT (English (U.S.))
Resource96=IDD_SUBMAP_BKGND (English (U.S.))
Resource97=IDD_DISCOVERY_TARGETS (English (U.S.))
-Resource98=IDD_OBJECT_COND_SCRIPT
+Resource98=IDD_INPUT_BOX
Resource99=IDA_NODE_POLLER (English (U.S.))
Resource100=IDD_CREATE_MP (English (U.S.))
Resource101=IDM_VIEW_SPECIFIC (English (U.S.))
@@ -244,7 +244,7 @@
Class103=CWebBrowser
Class104=CSyslogBrowser
Class105=CLPPList
-Resource129=IDD_OBJECT_NODE_POLL
+Resource129=IDD_SET_PASSWORD
Class106=CDCISchedulePage
Resource130=IDD_FATAL_ERROR (English (U.S.))
Class107=CObjectPropsStatus
@@ -270,113 +270,113 @@
Resource138=IDD_MANAGE_GRAPHS (English (U.S.))
Class120=CSubmapBkgndDlg
Resource139=IDD_USER_PROPERTIES (English (U.S.))
-Resource140=IDD_OBJECT_CLUSTER_GENERAL
-Resource141=IDD_GRAPH_PROP_SETTINGS
-Resource142=IDD_SAVE_AGENT_CFG
-Resource143=IDD_SET_CHILD_MGMT_STATUS
-Resource144=IDD_ACTION_PROPERTIES
-Resource145=IDD_MANAGE_GRAPHS
-Resource146=IDD_UPGRADE
-Resource147=IDA_EVENT_EDITOR
-Resource148=IDA_DATA_VIEW
-Resource149=IDD_OBJECT_CAPS
-Resource150=IDD_EDIT_IP_SUBNET
-Resource151=IDA_SCRIPT_MANAGER
-Resource152=IDD_CP_GENERAL
-Resource153=IDD_CREATE_CLUSTER
-Resource154=IDD_EDIT_VARIABLE
-Resource155=IDD_ABOUTBOX
-Resource156=IDD_OBJECT_SECURITY
-Resource157=IDD_CREATE_NETMAP
-Resource158=IDA_SERVER_CFG_EDITOR
-Resource159=IDD_OBJECT_PRESENTATION
-Resource160=IDD_CREATE_TG
-Resource161=IDD_THRESHOLD
-Resource162=IDA_MAP_MANAGER
+Resource140=IDD_DCI_SCHEDULE
+Resource141=IDD_THRESHOLD
+Resource142=IDD_CP_GENERAL
+Resource143=IDD_SNMP_WALK
+Resource144=IDA_CERT_MANAGER
+Resource145=IDD_CHANGE_IP
+Resource146=IDD_EDIT_IP_SUBNET
+Resource147=IDD_SELECT_TRAP
+Resource148=IDD_SET_CHILD_MGMT_STATUS
+Resource149=IDD_CREATE_NETMAP
+Resource150=IDD_EDIT_RULE_ALARM
+Resource151=IDD_IMPORT_CA_CERT
+Resource152=IDA_AGENT_CONFIG_MANAGER
+Resource153=IDD_SAVE_AGENT_CFG
+Resource154=IDD_SELECT_EVENT
+Resource155=IDD_EDIT_RULE_SITUATION
+Resource156=IDA_OBJECT_BROWSER
+Resource157=IDD_EDIT_RULE_SCRIPT
+Resource158=IDD_FATAL_ERROR
+Resource159=IDA_OBJECT_TOOLS_EDITOR
+Resource160=IDD_EDIT_EVENT
+Resource161=IDA_PACKAGE_MGR
+Resource162=IDD_SELECT_SITUATION
Resource163=IDM_VIEW_SPECIFIC
-Resource164=IDD_NEW_OBJECT_TOOL
-Resource165=IDA_PACKAGE_MGR
-Resource166=IDD_DESKTOP_SAVE_AS
-Resource167=IDD_AGENT_CONFIG
-Resource168=IDD_DCI_COLLECTION
-Resource169=IDD_OBJECT_IF_GENERAL
-Resource170=IDD_EDIT_RULE_SITUATION
-Resource171=IDD_CLUSTER_RESOURCE
+Resource164=IDD_CREATE_CONTAINER
+Resource165=IDD_OBJECT_CLUSTER_RESOURCES
+Resource166=IDD_DCI_THRESHOLDS
+Resource167=IDD_OBJECT_RELATIONS
+Resource168=IDA_TRAP_EDITOR
+Resource169=IDD_CREATE_CONDITION
+Resource170=IDD_ADD_DCI
+Resource171=IDD_OBJTOOL_GENERAL
Class121=CModuleManager
Class122=CDesktopManager
-Resource172=IDD_OBJECT_CLUSTER_RESOURCES
-Resource173=IDD_SELECT_EVENT
+Resource172=IDD_OBJECT_STATUS
+Resource173=IDA_DC_EDITOR
Class123=CCreateCondDlg
Class124=CCondPropsGeneral
Class125=CCondPropsScript
Class126=CCondPropsData
-Resource174=IDD_DCI_SCHEDULE
+Resource174=IDD_NEW_ACTION
Class127=CAddDCIDlg
-Resource175=IDD_IMPORT_CA_CERT
+Resource175=IDD_OBJTOOL_COLUMNS
Class128=CCondDCIPropDlg
-Resource176=IDD_OBJECT_COND_GENERAL
+Resource176=IDD_SELECT_AGENT_PARAM
Class129=CAgentConfigMgr
-Resource177=IDA_GRAPH
-Resource178=IDA_EPP
+Resource177=IDD_OBJECT_CLUSTER_GENERAL
+Resource178=IDD_ADDR_ENTRY
Class130=CAgentCfgDlg
Class131=CObjectCommentsEditor
-Resource179=IDD_EDIT_RULE_ALARM
+Resource179=IDA_DATA_VIEW
Class132=CRuleScriptDlg
Class133=CDetailsView
-Resource180=IDD_CREATE_TEMPLATE
+Resource180=IDD_OBJECT_NODE_GENERAL
Class134=CDiscoveryPropGeneral
-Resource181=IDD_SUBMAP_BKGND
+Resource181=IDD_EDIT_TRAP
Class135=CDiscoveryPropTargets
-Resource182=IDD_OBJTOOL_COLUMNS
+Resource182=IDD_CREATE_TEMPLATE
Class136=CDiscoveryPropAddrList
-Resource183=IDD_OBJECT_COND_DATA
+Resource183=IDD_CREATE_NETSRV
Class138=CObjectView
Class139=CObjectOverview
Class140=CAlarmView
Class141=CObjectDepView
-Resource184=IDD_NEW_ACTION
+Resource184=IDA_OBJECT_COMMENTS
Class137=CObjectBrowser
Class142=CCreateMPDlg
-Resource185=IDD_COND_DCI_PROP
+Resource185=IDD_OBJECT_NODE_POLL
Class143=CSelectMPDlg
-Resource186=IDD_OBJECT_STATUS
+Resource186=IDD_ACTION_PROPERTIES
Class144=CTrapSelDlg
-Resource187=IDD_OBJECT_GENERAL
+Resource187=IDA_MDI_DEFAULT
Class145=CConsoleUpgradeDlg
-Resource188=IDD_SNMP_WALK
+Resource188=IDD_DATA_QUERY
Class146=CCreateClusterDlg
-Resource189=IDD_SELECT_SITUATION
+Resource189=IDD_OBJECT_COND_DATA
Class147=CClusterPropsGeneral
-Resource190=IDD_SELECT_MAP
+Resource190=IDD_AGENT_CONFIG
Class148=CClusterPropsResources
-Resource191=IDD_MAP_LINK
+Resource191=IDD_CHANGE_PASSWORD
Class149=CClusterResDlg
-Resource192=IDD_EDIT_TRAP_ARG
+Resource192=IDD_OBJECT_GENERAL
Class150=CClusterView
Class151=CExtEditCtrl
-Resource193=IDD_OBJTOOL_GENERAL
+Resource193=IDD_SELECT_ACTION
Class152=CFatalErrorDlg
Resource194=IDM_CONTEXT
Class153=CDefineGraphDlg
-Resource195=IDD_OBJTOOL_OPTIONS
+Resource195=IDD_CREATE_NODE
Class154=CGraphManagerDlg
-Resource196=IDD_OBJECT_TRUSTED_NODES
+Resource196=IDD_COND_DCI_PROP
Class155=CGraphStylePage
Class156=CNodePerfView
Class157=CCertManager
-Resource197=IDD_CREATE_NETSRV
+Resource197=IDD_USER_PROPERTIES
Class158=CImportCertDlg
-Resource198=IDD_ADD_DCI
+Resource198=IDD_OBJECT_NETSRV_GENERAL
Class159=CNodeTopologyView
Class160=CObjectStatusBar
Class161=CObjectTree
-Resource199=IDD_GROUP_PROPERTIES
+Resource199=IDA_EVENT_EDITOR
Class162=CChildMgmtStatusDlg
-Resource200=IDD_CHANGE_IP
+Resource200=IDD_DCI_TRANSFORM
Class163=CCreateIfDCIDlg
Class164=CNodeLastValuesView
Class165=CObjectSubordinateView
-Resource201=IDA_ALARM_BROWSER
+Resource201=IDD_CREATE_MP
Class166=CMapLinkPropDlg
Resource202=IDD_INPUT_BOX (English (U.S.))
Resource203=IDD_EDIT_RULE_SEVERITY (English (U.S.))
@@ -430,21 +430,21 @@
Resource245=IDD_UPGRADE (English (U.S.))
Class173=CObjectPropsTrustedNodes
Resource246=IDD_OBJECT_TRUSTED_NODES (English (U.S.))
-Resource247=IDD_SELECT_MP
-Resource248=IDA_CERT_MANAGER
-Resource249=IDR_MAINFRAME
-Resource250=IDD_DISCOVERY_GENERAL
-Resource251=IDD_DISCOVERY_TARGETS
-Resource252=IDD_CREATE_CONTAINER
-Resource253=IDA_SITUATION_MANAGER
-Resource254=IDD_CREATE_MP
+Resource247=IDD_CREATE_VPNC
+Resource248=IDD_OBJECT_IF_GENERAL
+Resource249=IDD_DISCOVERY_GENERAL
+Resource250=IDD_GRAPH_PROP_SETTINGS
+Resource251=IDD_GRAPH_PROP_DATA
+Resource252=IDA_SITUATION_MANAGER
+Resource253=IDD_EDIT_RULE_OPTIONS
+Resource254=IDD_EDIT_VARIABLE
Class174=CMapSelDlg
Class175=CMapManager
-Resource255=IDD_EDIT_RULE_OPTIONS
-Resource256=IDD_DCI_DATA_EXPORT
+Resource255=IDD_OBJECT_COND_SCRIPT
+Resource256=IDD_EDIT_RULE_COMMENT
Class176=CCreateNetMapDlg
Class177=CObjectTreeCtrl
-Resource257=IDA_ACTION_EDITOR
+Resource257=IDD_UPGRADE
Class178=CObjectPropsCustomAttrs
Resource258=IDD_OBJECT_CUSTOM_ATTRS
@@ -1033,34 +1033,35 @@
Command187=ID_MAP_REDOLAYOUT
Command188=ID_MAP_SETBACKGROUND
Command189=ID_MAP_AUTOLAYOUT
-Command190=ID_MAP_SHOWCONNECTORNAMES
-Command191=ID_DATA_SCALEVALUE
-Command192=ID_DATA_SCALE_NORMAL
-Command193=ID_DATA_SCALE_KBYTES
-Command194=ID_DATA_SCALE_KILO
-Command195=ID_DATA_SCALE_MBYTES
-Command196=ID_DATA_SCALE_MEGA
-Command197=ID_DATA_SCALE_GBYTES
-Command198=ID_DATA_SCALE_GIGA
-Command199=ID_DATA_COPYTOCLIPBOARD
-Command200=ID_CONFIG_NEW
-Command201=ID_CONFIG_EDIT
-Command202=ID_CONFIG_DELETE
-Command203=ID_CONFIG_MOVEUP
-Command204=ID_CONFIG_MOVEDOWN
-Command205=ID_COMMENTS_SAVE
-Command206=ID_CERTIFICATE_IMPORT
-Command207=ID_CERTIFICATE_EDITCOMMENTS
-Command208=ID_CERTIFICATE_DELETE
-Command209=ID_EDIT_SELECT_ALL
-Command210=ID_POLLER_COPYTOCLIPBOARD
-Command211=ID_SITUATION_CREATE
-Command212=ID_SITUATION_EDIT
-Command213=ID_SITUATION_DELETE
-Command214=ID_SITUATION_CREATEINSTANCE
-Command215=ID_MAP_CREATE
-Command216=ID_MAP_DELETE
-CommandCount=216
+Command190=ID_MAP_ENSUREVISIBLE
+Command191=ID_MAP_SHOWCONNECTORNAMES
+Command192=ID_DATA_SCALEVALUE
+Command193=ID_DATA_SCALE_NORMAL
+Command194=ID_DATA_SCALE_KBYTES
+Command195=ID_DATA_SCALE_KILO
+Command196=ID_DATA_SCALE_MBYTES
+Command197=ID_DATA_SCALE_MEGA
+Command198=ID_DATA_SCALE_GBYTES
+Command199=ID_DATA_SCALE_GIGA
+Command200=ID_DATA_COPYTOCLIPBOARD
+Command201=ID_CONFIG_NEW
+Command202=ID_CONFIG_EDIT
+Command203=ID_CONFIG_DELETE
+Command204=ID_CONFIG_MOVEUP
+Command205=ID_CONFIG_MOVEDOWN
+Command206=ID_COMMENTS_SAVE
+Command207=ID_CERTIFICATE_IMPORT
+Command208=ID_CERTIFICATE_EDITCOMMENTS
+Command209=ID_CERTIFICATE_DELETE
+Command210=ID_EDIT_SELECT_ALL
+Command211=ID_POLLER_COPYTOCLIPBOARD
+Command212=ID_SITUATION_CREATE
+Command213=ID_SITUATION_EDIT
+Command214=ID_SITUATION_DELETE
+Command215=ID_SITUATION_CREATEINSTANCE
+Command216=ID_MAP_CREATE
+Command217=ID_MAP_DELETE
+CommandCount=217
[ACL:IDA_MDI_DEFAULT]
Type=1
Modified: trunk/src/console/win32/nxcon.rc
===================================================================
--- trunk/src/console/win32/nxcon.rc 2008-08-01 07:22:50 UTC (rev 3401)
+++ trunk/src/console/win32/nxcon.rc 2008-08-01 13:12:47 UTC (rev 3402)
@@ -596,6 +596,8 @@
MENUITEM "&Redo layout", ID_MAP_REDOLAYOUT
MENUITEM "S&et background...", ID_MAP_SETBACKGROUND
MENUITEM "Enable auto&matic layout", ID_MAP_AUTOLAYOUT
+ MENUITEM "Ensure &visibility of changed objects",
+ ID_MAP_ENSUREVISIBLE
MENUITEM "Show co&nnector names", ID_MAP_SHOWCONNECTORNAMES
END
POPUP "Data"
Modified: trunk/src/console/win32/resource.h
===================================================================
--- trunk/src/console/win32/resource.h 2008-08-01 07:22:50 UTC (rev 3401)
+++ trunk/src/console/win32/resource.h 2008-08-01 13:12:47 UTC (rev 3402)
@@ -975,6 +975,7 @@
#define ID_CONTROLPANEL_NETWORKMAPS 33095
#define ID_MAP_CREATE 33096
#define ID_MAP_DELETE 33097
+#define ID_MAP_ENSUREVISIBLE 33100
#define ID_ALWAYS_DISABLED 43210
#define IDS_GETFOLDERPATH_FAILED 61216
#define IDS_WORKDIR_CREATION_FAILED 61217
@@ -986,7 +987,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 390
-#define _APS_NEXT_COMMAND_VALUE 33100
+#define _APS_NEXT_COMMAND_VALUE 33101
#define _APS_NEXT_CONTROL_VALUE 1532
#define _APS_NEXT_SYMED_VALUE 135
#endif
Modified: trunk/src/server/core/email.cpp
===================================================================
--- trunk/src/server/core/email.cpp 2008-08-01 07:22:50 UTC (rev 3401)
+++ trunk/src/server/core/email.cpp 2008-08-01 13:12:47 UTC (rev 3402)
@@ -266,12 +266,12 @@
time_t currentTime;
struct tm *pCurrentTM;
time(&currentTime);
-#ifdef HAVE_GMTIME_R
+#ifdef HAVE_LOCALTIME_R
struct tm currentTM;
- gmtime_r(&currentTime, &currentTM);
+ localtime_r(&currentTime, &currentTM);
pCurrentTM = &currentTM;
#else
- pCurrentTM = gmtime(&currentTime);
+ pCurrentTM = localtime(&currentTime);
#endif
strftime(szBuffer, sizeof(szBuffer), "Date: %a, %d %b %Y %H:%M:%S %z\r\n", pCurrentTM);
SendEx(hSocket, szBuffer, strlen(szBuffer), 0);
Received on Fri Aug 01 2008 - 16:12:48 EEST
This archive was generated by hypermail 2.2.0 : Fri Aug 01 2008 - 16:10:38 EEST