user 계정 권한 입력 - 오프라인으로 BOTH 로 적용

ArinLog/obj/Debug/ArinLog.vbproj.FileListAbsolute.txt

@@ -102,3 +102,11 @@ C:\Source\ECO2\ECO2_170122_0003(190703)_Git\ArinLog\obj\Debug\ArinLog.Net4.pdb
 C:\Source\ECO2\ECO2_170122_0003(190703)_Git\ArinLog\bin\Debug\ArinLog.Net4.dll
 C:\Source\ECO2\ECO2_170122_0003(190703)_Git\ArinLog\bin\Debug\ArinLog.Net4.pdb
 C:\Source\ECO2\ECO2_170122_0003(190703)_Git\ArinLog\bin\Debug\ArinLog.Net4.xml
+E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\bin\Debug\ArinLog.Net4.dll
+E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\bin\Debug\ArinLog.Net4.pdb
+E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\bin\Debug\ArinLog.Net4.xml
+E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Resources.resources
+E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.vbproj.GenerateResource.Cache
+E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Net4.dll
+E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Net4.xml
+E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Net4.pdb

ArinWarev1/ECO2_2016.vbproj

@@ -57,7 +57,7 @@
     <DebugType>full</DebugType>
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
-    <OutputPath>c:\eco2\debug_2016\</OutputPath>
+    <OutputPath>..\..\..\..\..\eco2\debug_2016\</OutputPath>
     <DocumentationFile>
     </DocumentationFile>
     <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42353,42354,42355</NoWarn>
@@ -81,25 +81,25 @@
     <DefineConstants>MDI=true</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FarPoint.CalcEngine, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
+    <Reference Include="FarPoint.CalcEngine, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
       <Private>True</Private>
     </Reference>
-    <Reference Include="FarPoint.Excel, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
+    <Reference Include="FarPoint.Excel, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
       <Private>True</Private>
     </Reference>
-    <Reference Include="FarPoint.PDF, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
+    <Reference Include="FarPoint.PDF, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
       <Private>True</Private>
     </Reference>
-    <Reference Include="FarPoint.PluginCalendar.WinForms, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
+    <Reference Include="FarPoint.PluginCalendar.WinForms, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
       <Private>True</Private>
     </Reference>
-    <Reference Include="FarPoint.Win, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
+    <Reference Include="FarPoint.Win, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
       <Private>True</Private>
     </Reference>
-    <Reference Include="FarPoint.Win.Chart, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
+    <Reference Include="FarPoint.Win.Chart, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457">
       <Private>True</Private>
     </Reference>
-    <Reference Include="FarPoint.Win.Spread, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
+    <Reference Include="FarPoint.Win.Spread, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457, processorArchitecture=MSIL">
       <Private>True</Private>
     </Reference>
     <Reference Include="Interop.Excel, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">

ArinWarev1/Forms_Basic/Frm_Intro.vb

@@ -92,10 +92,10 @@
             UseriNfo = New ArinLogin.ArinLOgin.User_Info()
             UseriNfo.authtype = "IP"
             UseriNfo.name = tb_id.Text
-            'ElseIf tb_id.Text.StartsWith("user") Then
+        ElseIf tb_id.Text.StartsWith("user") Then
-            '    UseriNfo = New ArinLogin.ArinLOgin.User_Info()
+            UseriNfo = New ArinLogin.ArinLOgin.User_Info()
-            '    UseriNfo.authtype = "IP"
+            UseriNfo.authtype = "IP"
-            '    UseriNfo.name = tb_id.Text
+            UseriNfo.name = tb_id.Text
         Else
             Work_msg("서버 응답을 기다리는중")
             Dim L As New ArinLogin.ArinLOgin
@@ -110,7 +110,7 @@
 
         Select Case UseriNfo.authtype
             Case "IP"
-                If Me.tb_id.Text.ToLower() <> "guest" Then 'AndAlso Not Me.tb_id.Text.ToLower().StartsWith("user") Then
+                If Me.tb_id.Text.ToLower() <> "guest" AndAlso Not Me.tb_id.Text.ToLower().StartsWith("user") Then
                     If Prj.CUrIP.ToUpper <> UseriNfo.authip.ToUpper Then
                         MsgBox("로그인사용자와 현재컴퓨터의 IP가 일치하지않습니다", MsgBoxStyle.Critical, "확인")
                         Return
@@ -120,17 +120,24 @@
                         Dim userPass As String
                         Dim userMAC As String
                         Dim userIP As String
-                        userMAC = Prj.CUrMac.GetHashCode
+
+
+                        If Me.tb_id.Text.ToLower().StartsWith("user") Then
+                            userMAC = ("USER" & Prj.CUrMac.Substring(4)).GetHashCode
+                        Else
+                            userMAC = Prj.CUrMac.GetHashCode
+                        End If
+
                         userIP = Prj.CUrIP.GetHashCode
                         userPass = userIP + userMAC
                         userPass = userPass.GetHashCode
                         If CLng(userPass) < 0 Then
                             userPass = (CLng(userPass) * -1).ToString
                         End If
-                        'If Me.tb_pw.Text <> userPass Then
+                        If tb_id.Text.ToLower().StartsWith("user") AndAlso Me.tb_pw.Text <> userPass Then
-                        '    MsgBox("존재하지 않는계정이거나 비밀번호오류입니다", MsgBoxStyle.Critical, "확인")
+                            MsgBox("존재하지 않는계정이거나 비밀번호오류입니다", MsgBoxStyle.Critical, "확인")
-                        '    End
+                            End
-                        'End If
+                        End If
                     Catch ex As Exception
                         MsgBox("존재하지 않는계정이거나 비밀번호오류입니다", MsgBoxStyle.Critical, "확인")
                         End
@@ -161,8 +168,8 @@
         Prj.UserPass = Me.tb_pw.Text
         If Me.tb_id.Text.ToLower() = "guest" Then
             Prj.UserAuthType = "BOTH0"
-            'ElseIf Me.tb_id.Text.ToLower().StartsWith("user") Then
+        ElseIf Me.tb_id.Text.ToLower().StartsWith("user") Then
-            '    Prj.UserAuthType = "BOTH"
+            Prj.UserAuthType = "BOTH"
         Else
             Prj.UserAuthType = UseriNfo.authtype
         End If

ArinWarev1/Forms_Input/Frm_Desc.vb

@@ -113,7 +113,7 @@
             Me.bs.MoveFirst()
         End Try
 
-        If Not (Prj.UserId.ToLower() = "guest" OrElse Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1") Then  '//2011.03.08 추가
+        If Not (Prj.UserId.ToLower() = "guest" OrElse Prj.UserId.ToLower().StartsWith("user") OrElse Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1") Then  '//2011.03.08 추가
             Dim MyVersion As String '= Format(My.Application.Info.Version.Minor, "0000") & Format(My.Application.Info.Version.Build, "0000")
             Dim L As New ArinLogin.ArinLOgin
             Dim VersionInfo As ArinLogin.ArinLOgin.sVersionInfo = Nothing
@@ -177,12 +177,12 @@
             End Try
         Else
             If Not Prj.UserId.ToLower() = "guest" Then
-
+                '//서버업데이트기능 숨김
                 Me.LinkLabel1.Visible = True
                 Me.LinkLabel2.Visible = True
                 Me.LinkLabel3.Visible = True
             End If
-            End If
+        End If
 
             AddHandler DSET1.tbl_Desc.ColumnChanging, AddressOf AddNewDataRow_Zone_Changed2
 

ArinWarev1/MdiMain.vb

@@ -149,7 +149,7 @@ Public Class MdiMain
         End Select
 
         Try
-            If Not Prj.UserId.ToLower().StartsWith("guest") Then
+            If Not Prj.UserId.ToLower().StartsWith("guest") AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then
                 Work_msg("<EFBFBD><EFBFBD><EFBFBD>α׷<EFBFBD> <20><><EFBFBD><EFBFBD>Ȯ<EFBFBD><C8AE><EFBFBD><EFBFBD>")
                 If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then  '//2011.03.09 <20>߰<EFBFBD>
                     VersionInfo = L.Get_LastVersion("E")   '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD>  eco <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ٲ<EFBFBD><D9B2>߰<EFBFBD><DFB0><EFBFBD> ^^ <20><><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD> <20>ֵ<EFBFBD><D6B5><EFBFBD> <20>սô<D5BD>!
@@ -834,7 +834,7 @@ Public Class MdiMain
             End Try
 
             pLog.Add(String.Format("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = {0}", MyVersion))
-            If Prj.UserId.ToLower() <> "guest" Then '//191020
+            If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020
                 Try
 
                     VersionInfo = L.Get_LastVersion("C2")   '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD>  eco <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ٲ<EFBFBD><D9B2>߰<EFBFBD><DFB0><EFBFBD> ^^ <20><><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD> <20>ֵ<EFBFBD><D6B5><EFBFBD> <20>սô<D5BD>!
@@ -870,7 +870,7 @@ Public Class MdiMain
 
             pLog.Add(String.Format("ǥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϲ<EFBFBD><EFBFBD><EFBFBD> = {0}", MyVersion))
 
-            If Prj.UserId.ToLower() <> "guest" Then '//191020
+            If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020
                 Try
                     VersionInfo = L.Get_LastVersion("P2")   '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD>  eco <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ٲ<EFBFBD><D9B2>߰<EFBFBD><DFB0><EFBFBD> ^^ <20><><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD> <20>ֵ<EFBFBD><D6B5><EFBFBD> <20>սô<D5BD>!
                     If VersionInfo.Ver <> "0" AndAlso (CInt(VersionInfo.Ver) > CInt(MyVersion)) Then   '//0<><30> <20><><EFBFBD>ų<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>̹Ƿ<CCB9> <20>Ѿ<D1BE><EEB0A3>.
@@ -905,7 +905,7 @@ Public Class MdiMain
             End Try
 
             pLog.Add(String.Format("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͹<EFBFBD><EFBFBD><EFBFBD> = {0}", MyVersion))
-            If Prj.UserId.ToLower() <> "guest" Then '//191020
+            If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020
                 Try
                     'MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString
                     VersionInfo = L.Get_LastVersion("W2")   '//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD>  eco <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ٲ<EFBFBD><D9B2>߰<EFBFBD><DFB0><EFBFBD> ^^ <20><><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD> <20>ֵ<EFBFBD><D6B5><EFBFBD> <20>սô<D5BD>!
@@ -1327,19 +1327,26 @@ ENDSTAT:  '//
         Prj.Admin = True
         Prj.Password = ""   '//<2F><>ȣ<EFBFBD><C8A3> <20>⺻<EFBFBD><E2BABB><EFBFBD><EFBFBD><EFBFBD>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD><EFBFBD>
 
-        For Each A As Net.NetworkInformation.NetworkInterface In ArinNet.MyNet.GetMacArray
+        Try
-            If A.NetworkInterfaceType <> Net.NetworkInformation.NetworkInterfaceType.Loopback Then
+            For Each A As Net.NetworkInformation.NetworkInterface In ArinNet.MyNet.GetMacArray
-                Prj.CUrMac = A.GetPhysicalAddress.ToString
+                If A.NetworkInterfaceType <> Net.NetworkInformation.NetworkInterfaceType.Loopback Then
-            End If
+                    Prj.CUrMac = A.GetPhysicalAddress.ToString
-        Next
+                End If
+            Next
+            Dim ipentry As Net.IPHostEntry = System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName)
+            For Each C As Net.IPAddress In ipentry.AddressList
+                If C.ToString.Length <= 15 AndAlso C.ToString.Length > 4 Then
+                    Prj.CUrIP = C.ToString
+                    Exit For
+                End If
+            Next
+        Catch ex As Exception
+            Prj.CUrMac = "NOMAC"
+            Prj.CUrIP = "127.0.0.1"
+        End Try
+
+
         
-        Dim ipentry As Net.IPHostEntry = System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName)
-        For Each C As Net.IPAddress In ipentry.AddressList
-            If C.ToString.Length <= 15 AndAlso C.ToString.Length > 4 Then
-                Prj.CUrIP = C.ToString
-                Exit For
-            End If
-        Next
 
         '//<2F><><EFBFBD><EFBFBD><EFBFBD>͵<EFBFBD><CDB5><EFBFBD><EFBFBD>丮<EFBFBD><E4B8AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ȯ<><C8AE><EFBFBD>Ѵ<EFBFBD> <20>̰<EFBFBD><CCB0><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ͺ<EFBFBD><CDBA>̽<EFBFBD><CCBD><EFBFBD> <20><>Ÿ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD><CFB0>Ѵ<EFBFBD> 
         '//<2F>̴<EFBFBD> <20><><EFBFBD>ͳݼ<CDB3>ġ<EFBFBD><C4A1><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>⋚<EFBFBD><E28B9A><EFBFBD>̴<EFBFBD>

ArinWarev1/My Project/licenses.licx

@@ -1 +1 @@
-FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457
+FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=5.0.3518.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457