git-svn-id: https://svn.origo.ethz.ch/ircddotnet/trunk@19 3fea7bcf-81…

…c2-4a08-a3b7-d3cc9173df77

IrcD.Net/Database/Main.cs

@@ -22,5 +22,6 @@ namespace IrcD.Database
 {
     partial class Main
     {
+
     }
 }

IrcD.Net/Database/User.cs

@@ -22,5 +22,6 @@ namespace IrcD.Database
 {
     partial class User
     {
+
     }
 }

IrcD.Net/IrcD.Net.csproj

@@ -128,6 +128,7 @@
     <Compile Include="Database\DatabaseCommon.cs" />
     <Compile Include="Database\DatabaseModel.cs" />
     <Compile Include="Database\Log.cs" />
+    <Compile Include="Database\Main.cs" />
     <Compile Include="Database\Nick.cs" />
     <Compile Include="Database\Setting.cs" />
     <Compile Include="Database\User.cs" />
@@ -152,6 +153,7 @@
     <Compile Include="Modes\ChannelRanks\ModeVoice.cs" />
     <Compile Include="Modes\ChannelRank.cs" />
     <Compile Include="Modes\Mode.cs" />
+    <Compile Include="Modes\ModeFactory.cs" />
     <Compile Include="Modes\ModeList.cs" />
     <Compile Include="Modes\RankList.cs" />
     <Compile Include="Modes\UserMode.cs" />

IrcD.Net/IrcDaemon.cs

@@ -363,108 +363,6 @@ private string[] GetSubArgument(string arg)
             return arg.Split(new[] { ',' });
         }
 
-        private Dictionary<char, bool> ParseUserMode(string umode)
-        {
-            var changemodes = new Dictionary<char, bool>();
-            bool plus = true; // if + or - is ommited at beginning we treat it as +
-            foreach (char c in umode)
-            {
-                switch (c)
-                {
-                    case '+': plus = true;
-                        break;
-                    case '-': plus = false;
-                        break;
-                    default: changemodes.Add(c, plus);
-                        break;
-                }
-            }
-            return changemodes;
-        }
-
-        private readonly List<char> modeWithParams = new List<char> { 'b', 'e', 'h', 'I', 'k', 'l', 'o', 'O', 'v' };
-
-        private class ModeElement
-        {
-            public ModeElement(char mode, bool? plus, string param)
-            {
-                this.mode = mode;
-                this.plus = plus;
-                this.param = param;
-            }
-
-            private char mode;
-
-            public char Mode
-            {
-                get { return mode; }
-            }
-
-            private bool? plus;
-
-            public bool? Plus
-            {
-                get { return plus; }
-            }
-
-            private string param;
-
-            public string Param
-            {
-                get { return param; }
-            }
-
-        }
-
-        private List<ModeElement> ParseChannelModes(List<string> cmode)
-        {
-            var changemodes = new List<ModeElement>();
-            bool? plus;
-            int arg = 1;
-            int paramsNeeded;
-            while (arg < cmode.Count)
-            {
-                plus = null; paramsNeeded = 0;
-                foreach (char c in cmode[arg])
-                {
-                    if (c == '+')
-                    {
-                        plus = true;
-                    }
-                    else if (c == '-')
-                    {
-                        plus = false;
-                    }
-                    else
-                    {
-                        if (modeWithParams.Contains(c))
-                        {
-                            paramsNeeded++;
-                            if (plus == null)
-                            {
-                                changemodes.Add(new ModeElement(c, plus, null));
-                            }
-                            else
-                            {
-                                try
-                                {
-                                    changemodes.Add(new ModeElement(c, plus, cmode[arg + paramsNeeded]));
-                                }
-                                catch (ArgumentOutOfRangeException) { }
-                            }
-                        }
-                        else
-                        {
-                            changemodes.Add(new ModeElement(c, plus, null));
-                        }
-
-                    }
-                }
-                arg = arg + paramsNeeded + 1;
-            }
-
-            return changemodes;
-        }
 
         /// <summary>
         /// Check if an IRC Operatur status can be granted upon user and pass

IrcD.Net/UserInfo.cs

@@ -23,6 +23,7 @@
 using System.Linq;
 using System.Net.Sockets;
 using System.Text;
+using IrcD.Database;
 using IrcD.Modes;
 using IrcD.Utils;
 
@@ -34,12 +35,12 @@ public class UserInfo : InfoBase
         public UserInfo(IrcDaemon ircDaemon, Socket socket, string host, bool isAcceptSocket, bool passAccepted)
             : base(ircDaemon)
         {
-            AwayMsg = null;
-            Realname = null;
+            //AwayMsg = null;
+            //Realname = null;
             IsService = false;
             Registered = false;
             PassAccepted = passAccepted;
-            this.host = host;
+            //this.host = host;
             this.isAcceptSocket = isAcceptSocket;
             this.socket = socket;
         }
@@ -70,52 +71,14 @@ public bool IsAcceptSocket
 
         public bool IsService { get; set; }
 
-        private string nick = null;
-
-        public string Nick
-        {
-            get
-            {
-                return nick;
-            }
-            internal set
-            {
-                nick = value;
-            }
-        }
-
-        public string Realname { get; internal set; }
-
-
-        private string user;
-
-        public string User
-        {
-            get
-            {
-                return user;
-            }
-            internal set
-            {
-                user = value;
-            }
-        }
-
-        private readonly string host;
-
-        public string Host
-        {
-            get
-            {
-                return host;
-            }
-        }
+        private User data;
 
         public string Usermask
         {
             get
-            {
-                return nick + "!" + user + "@" + host;
+           {
+                //return nick + "!" + user + "@" + host;
+               return 
             }
         }
 
@@ -127,8 +90,6 @@ public string Prefix
             }
         }
 
-        public string AwayMsg { get; set; }
-
         private DateTime lastAction = DateTime.Now;
 
         public DateTime LastAction