From 5bebce9e602090f96715f2af3c252733cc9882d9 Mon Sep 17 00:00:00 2001 From: dev_amdtel Date: Thu, 4 Dec 2014 18:10:38 +0400 Subject: [PATCH] wsp-10256 Importing Exchange mailboxes --- .../ApplicationForm.Designer.cs | 599 +++++++++--------- .../ApplicationForm.cs | 39 +- .../ApplicationForm.resx | 102 +-- .../WebsitePanel.Import.Enterprise/Global.cs | 1 + .../OrganizationImporter.cs | 7 +- .../HostedSolution/ExchangeMailboxPlan.cs | 10 +- 6 files changed, 414 insertions(+), 344 deletions(-) diff --git a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.Designer.cs b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.Designer.cs index af549f66..d462be62 100644 --- a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.Designer.cs +++ b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.Designer.cs @@ -28,296 +28,319 @@ namespace WebsitePanel.Import.Enterprise /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ApplicationForm)); - this.lblSpace = new System.Windows.Forms.Label(); - this.txtSpace = new System.Windows.Forms.TextBox(); - this.btnBrowseSpace = new System.Windows.Forms.Button(); - this.btnBrowseOU = new System.Windows.Forms.Button(); - this.txtOU = new System.Windows.Forms.TextBox(); - this.lblOU = new System.Windows.Forms.Label(); - this.grpOrganization = new System.Windows.Forms.GroupBox(); - this.btnSelectAll = new System.Windows.Forms.Button(); - this.btnDeselectAll = new System.Windows.Forms.Button(); - this.rbCreateAndImport = new System.Windows.Forms.RadioButton(); - this.rbImport = new System.Windows.Forms.RadioButton(); - this.lvUsers = new System.Windows.Forms.ListView(); - this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader3 = new System.Windows.Forms.ColumnHeader(); - this.images = new System.Windows.Forms.ImageList(this.components); - this.txtOrgName = new System.Windows.Forms.TextBox(); - this.lblOrgName = new System.Windows.Forms.Label(); - this.txtOrgId = new System.Windows.Forms.TextBox(); - this.lblOrgId = new System.Windows.Forms.Label(); - this.btnStart = new System.Windows.Forms.Button(); - this.progressBar = new System.Windows.Forms.ProgressBar(); - this.lblMessage = new System.Windows.Forms.Label(); - this.grpOrganization.SuspendLayout(); - this.SuspendLayout(); - // - // lblSpace - // - this.lblSpace.Location = new System.Drawing.Point(15, 15); - this.lblSpace.Name = "lblSpace"; - this.lblSpace.Size = new System.Drawing.Size(125, 23); - this.lblSpace.TabIndex = 0; - this.lblSpace.Text = "Target Hosting Space:"; - // - // txtSpace - // - this.txtSpace.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.txtSpace.Location = new System.Drawing.Point(146, 12); - this.txtSpace.Name = "txtSpace"; - this.txtSpace.ReadOnly = true; - this.txtSpace.Size = new System.Drawing.Size(429, 20); - this.txtSpace.TabIndex = 1; - this.txtSpace.TextChanged += new System.EventHandler(this.OnDataChanged); - // - // btnBrowseSpace - // - this.btnBrowseSpace.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnBrowseSpace.Location = new System.Drawing.Point(581, 10); - this.btnBrowseSpace.Name = "btnBrowseSpace"; - this.btnBrowseSpace.Size = new System.Drawing.Size(24, 22); - this.btnBrowseSpace.TabIndex = 2; - this.btnBrowseSpace.Text = "..."; - this.btnBrowseSpace.UseVisualStyleBackColor = true; - this.btnBrowseSpace.Click += new System.EventHandler(this.OnBrowseSpace); - // - // btnBrowseOU - // - this.btnBrowseOU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnBrowseOU.Location = new System.Drawing.Point(581, 36); - this.btnBrowseOU.Name = "btnBrowseOU"; - this.btnBrowseOU.Size = new System.Drawing.Size(24, 22); - this.btnBrowseOU.TabIndex = 5; - this.btnBrowseOU.Text = "..."; - this.btnBrowseOU.UseVisualStyleBackColor = true; - this.btnBrowseOU.Click += new System.EventHandler(this.OnBrowseOU); - // - // txtOU - // - this.txtOU.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.txtOU.Location = new System.Drawing.Point(146, 38); - this.txtOU.Name = "txtOU"; - this.txtOU.ReadOnly = true; - this.txtOU.Size = new System.Drawing.Size(429, 20); - this.txtOU.TabIndex = 4; - this.txtOU.TextChanged += new System.EventHandler(this.OnDataChanged); - // - // lblOU - // - this.lblOU.Location = new System.Drawing.Point(15, 41); - this.lblOU.Name = "lblOU"; - this.lblOU.Size = new System.Drawing.Size(125, 23); - this.lblOU.TabIndex = 3; - this.lblOU.Text = "Organizational Unit:"; - // - // grpOrganization - // - this.grpOrganization.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.grpOrganization.Controls.Add(this.btnSelectAll); - this.grpOrganization.Controls.Add(this.btnDeselectAll); - this.grpOrganization.Controls.Add(this.rbCreateAndImport); - this.grpOrganization.Controls.Add(this.rbImport); - this.grpOrganization.Controls.Add(this.lvUsers); - this.grpOrganization.Controls.Add(this.txtOrgName); - this.grpOrganization.Controls.Add(this.lblOrgName); - this.grpOrganization.Controls.Add(this.txtOrgId); - this.grpOrganization.Controls.Add(this.lblOrgId); - this.grpOrganization.Location = new System.Drawing.Point(15, 67); - this.grpOrganization.Name = "grpOrganization"; - this.grpOrganization.Size = new System.Drawing.Size(590, 328); - this.grpOrganization.TabIndex = 6; - this.grpOrganization.TabStop = false; - // - // btnSelectAll - // - this.btnSelectAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnSelectAll.Location = new System.Drawing.Point(417, 282); - this.btnSelectAll.Name = "btnSelectAll"; - this.btnSelectAll.Size = new System.Drawing.Size(75, 23); - this.btnSelectAll.TabIndex = 7; - this.btnSelectAll.Text = "Select All"; - this.btnSelectAll.UseVisualStyleBackColor = true; - this.btnSelectAll.Click += new System.EventHandler(this.OnSelectAllClick); - // - // btnDeselectAll - // - this.btnDeselectAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnDeselectAll.Location = new System.Drawing.Point(498, 282); - this.btnDeselectAll.Name = "btnDeselectAll"; - this.btnDeselectAll.Size = new System.Drawing.Size(75, 23); - this.btnDeselectAll.TabIndex = 8; - this.btnDeselectAll.Text = "Unselect All"; - this.btnDeselectAll.UseVisualStyleBackColor = true; - this.btnDeselectAll.Click += new System.EventHandler(this.OnDeselectAllClick); - // - // rbCreateAndImport - // - this.rbCreateAndImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.rbCreateAndImport.AutoSize = true; - this.rbCreateAndImport.Checked = true; - this.rbCreateAndImport.Enabled = false; - this.rbCreateAndImport.Location = new System.Drawing.Point(19, 282); - this.rbCreateAndImport.Name = "rbCreateAndImport"; - this.rbCreateAndImport.Size = new System.Drawing.Size(261, 17); - this.rbCreateAndImport.TabIndex = 5; - this.rbCreateAndImport.TabStop = true; - this.rbCreateAndImport.Text = "Create new organization and import selected items"; - this.rbCreateAndImport.UseVisualStyleBackColor = true; - this.rbCreateAndImport.CheckedChanged += new System.EventHandler(this.OnCheckedChanged); - // - // rbImport - // - this.rbImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.rbImport.AutoSize = true; - this.rbImport.Enabled = false; - this.rbImport.Location = new System.Drawing.Point(19, 305); - this.rbImport.Name = "rbImport"; - this.rbImport.Size = new System.Drawing.Size(237, 17); - this.rbImport.TabIndex = 6; - this.rbImport.Text = "Import selected items for existing organization"; - this.rbImport.UseVisualStyleBackColor = true; - // - // lvUsers - // - this.lvUsers.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lvUsers.CheckBoxes = true; - this.lvUsers.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ApplicationForm)); + this.lblSpace = new System.Windows.Forms.Label(); + this.txtSpace = new System.Windows.Forms.TextBox(); + this.btnBrowseSpace = new System.Windows.Forms.Button(); + this.btnBrowseOU = new System.Windows.Forms.Button(); + this.txtOU = new System.Windows.Forms.TextBox(); + this.lblOU = new System.Windows.Forms.Label(); + this.grpOrganization = new System.Windows.Forms.GroupBox(); + this.cbMailboxPlan = new System.Windows.Forms.ComboBox(); + this.lblMailnoxPlan = new System.Windows.Forms.Label(); + this.btnSelectAll = new System.Windows.Forms.Button(); + this.btnDeselectAll = new System.Windows.Forms.Button(); + this.rbCreateAndImport = new System.Windows.Forms.RadioButton(); + this.rbImport = new System.Windows.Forms.RadioButton(); + this.lvUsers = new System.Windows.Forms.ListView(); + this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.images = new System.Windows.Forms.ImageList(this.components); + this.txtOrgName = new System.Windows.Forms.TextBox(); + this.lblOrgName = new System.Windows.Forms.Label(); + this.txtOrgId = new System.Windows.Forms.TextBox(); + this.lblOrgId = new System.Windows.Forms.Label(); + this.btnStart = new System.Windows.Forms.Button(); + this.progressBar = new System.Windows.Forms.ProgressBar(); + this.lblMessage = new System.Windows.Forms.Label(); + this.grpOrganization.SuspendLayout(); + this.SuspendLayout(); + // + // lblSpace + // + this.lblSpace.Location = new System.Drawing.Point(15, 15); + this.lblSpace.Name = "lblSpace"; + this.lblSpace.Size = new System.Drawing.Size(125, 23); + this.lblSpace.TabIndex = 0; + this.lblSpace.Text = "Target Hosting Space:"; + // + // txtSpace + // + this.txtSpace.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtSpace.Location = new System.Drawing.Point(146, 12); + this.txtSpace.Name = "txtSpace"; + this.txtSpace.ReadOnly = true; + this.txtSpace.Size = new System.Drawing.Size(426, 20); + this.txtSpace.TabIndex = 1; + this.txtSpace.TextChanged += new System.EventHandler(this.OnDataChanged); + // + // btnBrowseSpace + // + this.btnBrowseSpace.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnBrowseSpace.Location = new System.Drawing.Point(578, 10); + this.btnBrowseSpace.Name = "btnBrowseSpace"; + this.btnBrowseSpace.Size = new System.Drawing.Size(24, 22); + this.btnBrowseSpace.TabIndex = 2; + this.btnBrowseSpace.Text = "..."; + this.btnBrowseSpace.UseVisualStyleBackColor = true; + this.btnBrowseSpace.Click += new System.EventHandler(this.OnBrowseSpace); + // + // btnBrowseOU + // + this.btnBrowseOU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnBrowseOU.Location = new System.Drawing.Point(578, 36); + this.btnBrowseOU.Name = "btnBrowseOU"; + this.btnBrowseOU.Size = new System.Drawing.Size(24, 22); + this.btnBrowseOU.TabIndex = 5; + this.btnBrowseOU.Text = "..."; + this.btnBrowseOU.UseVisualStyleBackColor = true; + this.btnBrowseOU.Click += new System.EventHandler(this.OnBrowseOU); + // + // txtOU + // + this.txtOU.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtOU.Location = new System.Drawing.Point(146, 38); + this.txtOU.Name = "txtOU"; + this.txtOU.ReadOnly = true; + this.txtOU.Size = new System.Drawing.Size(426, 20); + this.txtOU.TabIndex = 4; + this.txtOU.TextChanged += new System.EventHandler(this.OnDataChanged); + // + // lblOU + // + this.lblOU.Location = new System.Drawing.Point(15, 41); + this.lblOU.Name = "lblOU"; + this.lblOU.Size = new System.Drawing.Size(125, 23); + this.lblOU.TabIndex = 3; + this.lblOU.Text = "Organizational Unit:"; + // + // grpOrganization + // + this.grpOrganization.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.grpOrganization.Controls.Add(this.cbMailboxPlan); + this.grpOrganization.Controls.Add(this.lblMailnoxPlan); + this.grpOrganization.Controls.Add(this.btnSelectAll); + this.grpOrganization.Controls.Add(this.btnDeselectAll); + this.grpOrganization.Controls.Add(this.rbCreateAndImport); + this.grpOrganization.Controls.Add(this.rbImport); + this.grpOrganization.Controls.Add(this.lvUsers); + this.grpOrganization.Controls.Add(this.txtOrgName); + this.grpOrganization.Controls.Add(this.lblOrgName); + this.grpOrganization.Controls.Add(this.txtOrgId); + this.grpOrganization.Controls.Add(this.lblOrgId); + this.grpOrganization.Location = new System.Drawing.Point(15, 67); + this.grpOrganization.Name = "grpOrganization"; + this.grpOrganization.Size = new System.Drawing.Size(587, 328); + this.grpOrganization.TabIndex = 6; + this.grpOrganization.TabStop = false; + // + // cbMailboxPlan + // + this.cbMailboxPlan.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.cbMailboxPlan.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbMailboxPlan.FormattingEnabled = true; + this.cbMailboxPlan.Location = new System.Drawing.Point(155, 74); + this.cbMailboxPlan.Name = "cbMailboxPlan"; + this.cbMailboxPlan.Size = new System.Drawing.Size(415, 21); + this.cbMailboxPlan.TabIndex = 10; + // + // lblMailnoxPlan + // + this.lblMailnoxPlan.Location = new System.Drawing.Point(19, 74); + this.lblMailnoxPlan.Name = "lblMailnoxPlan"; + this.lblMailnoxPlan.Size = new System.Drawing.Size(130, 23); + this.lblMailnoxPlan.TabIndex = 9; + this.lblMailnoxPlan.Text = "Default mailbox plan :"; + // + // btnSelectAll + // + this.btnSelectAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnSelectAll.Location = new System.Drawing.Point(414, 282); + this.btnSelectAll.Name = "btnSelectAll"; + this.btnSelectAll.Size = new System.Drawing.Size(75, 23); + this.btnSelectAll.TabIndex = 7; + this.btnSelectAll.Text = "Select All"; + this.btnSelectAll.UseVisualStyleBackColor = true; + this.btnSelectAll.Click += new System.EventHandler(this.OnSelectAllClick); + // + // btnDeselectAll + // + this.btnDeselectAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnDeselectAll.Location = new System.Drawing.Point(495, 282); + this.btnDeselectAll.Name = "btnDeselectAll"; + this.btnDeselectAll.Size = new System.Drawing.Size(75, 23); + this.btnDeselectAll.TabIndex = 8; + this.btnDeselectAll.Text = "Unselect All"; + this.btnDeselectAll.UseVisualStyleBackColor = true; + this.btnDeselectAll.Click += new System.EventHandler(this.OnDeselectAllClick); + // + // rbCreateAndImport + // + this.rbCreateAndImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.rbCreateAndImport.AutoSize = true; + this.rbCreateAndImport.Checked = true; + this.rbCreateAndImport.Enabled = false; + this.rbCreateAndImport.Location = new System.Drawing.Point(19, 282); + this.rbCreateAndImport.Name = "rbCreateAndImport"; + this.rbCreateAndImport.Size = new System.Drawing.Size(261, 17); + this.rbCreateAndImport.TabIndex = 5; + this.rbCreateAndImport.TabStop = true; + this.rbCreateAndImport.Text = "Create new organization and import selected items"; + this.rbCreateAndImport.UseVisualStyleBackColor = true; + this.rbCreateAndImport.CheckedChanged += new System.EventHandler(this.OnCheckedChanged); + // + // rbImport + // + this.rbImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.rbImport.AutoSize = true; + this.rbImport.Enabled = false; + this.rbImport.Location = new System.Drawing.Point(19, 305); + this.rbImport.Name = "rbImport"; + this.rbImport.Size = new System.Drawing.Size(237, 17); + this.rbImport.TabIndex = 6; + this.rbImport.Text = "Import selected items for existing organization"; + this.rbImport.UseVisualStyleBackColor = true; + // + // lvUsers + // + this.lvUsers.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.lvUsers.CheckBoxes = true; + this.lvUsers.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.columnHeader1, this.columnHeader2, this.columnHeader3}); - this.lvUsers.FullRowSelect = true; - this.lvUsers.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.lvUsers.Location = new System.Drawing.Point(19, 74); - this.lvUsers.MultiSelect = false; - this.lvUsers.Name = "lvUsers"; - this.lvUsers.Size = new System.Drawing.Size(554, 202); - this.lvUsers.SmallImageList = this.images; - this.lvUsers.TabIndex = 4; - this.lvUsers.UseCompatibleStateImageBehavior = false; - this.lvUsers.View = System.Windows.Forms.View.Details; - // - // columnHeader1 - // - this.columnHeader1.Text = "Name"; - this.columnHeader1.Width = 229; - // - // columnHeader2 - // - this.columnHeader2.Text = "Email"; - this.columnHeader2.Width = 163; - // - // columnHeader3 - // - this.columnHeader3.Text = "Type"; - this.columnHeader3.Width = 152; - // - // images - // - this.images.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("images.ImageStream"))); - this.images.TransparentColor = System.Drawing.Color.Transparent; - this.images.Images.SetKeyName(0, "UserSmallIcon.ico"); - this.images.Images.SetKeyName(1, "contact.ico"); - this.images.Images.SetKeyName(2, "DL.ico"); - // - // txtOrgName - // - this.txtOrgName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.txtOrgName.Location = new System.Drawing.Point(155, 45); - this.txtOrgName.Name = "txtOrgName"; - this.txtOrgName.Size = new System.Drawing.Size(418, 20); - this.txtOrgName.TabIndex = 3; - // - // lblOrgName - // - this.lblOrgName.Location = new System.Drawing.Point(19, 48); - this.lblOrgName.Name = "lblOrgName"; - this.lblOrgName.Size = new System.Drawing.Size(130, 23); - this.lblOrgName.TabIndex = 2; - this.lblOrgName.Text = "Organization Name:"; - // - // txtOrgId - // - this.txtOrgId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.txtOrgId.Location = new System.Drawing.Point(155, 19); - this.txtOrgId.Name = "txtOrgId"; - this.txtOrgId.ReadOnly = true; - this.txtOrgId.Size = new System.Drawing.Size(418, 20); - this.txtOrgId.TabIndex = 1; - // - // lblOrgId - // - this.lblOrgId.Location = new System.Drawing.Point(19, 22); - this.lblOrgId.Name = "lblOrgId"; - this.lblOrgId.Size = new System.Drawing.Size(130, 23); - this.lblOrgId.TabIndex = 0; - this.lblOrgId.Text = "Organization Id:"; - // - // btnStart - // - this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnStart.Location = new System.Drawing.Point(527, 461); - this.btnStart.Name = "btnStart"; - this.btnStart.Size = new System.Drawing.Size(75, 23); - this.btnStart.TabIndex = 9; - this.btnStart.Text = "Start"; - this.btnStart.UseVisualStyleBackColor = true; - this.btnStart.Click += new System.EventHandler(this.OnImportClick); - // - // progressBar - // - this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.progressBar.Location = new System.Drawing.Point(15, 427); - this.progressBar.Name = "progressBar"; - this.progressBar.Size = new System.Drawing.Size(587, 23); - this.progressBar.TabIndex = 8; - // - // lblMessage - // - this.lblMessage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblMessage.Location = new System.Drawing.Point(12, 401); - this.lblMessage.Name = "lblMessage"; - this.lblMessage.Size = new System.Drawing.Size(593, 23); - this.lblMessage.TabIndex = 7; - // - // ApplicationForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(617, 496); - this.Controls.Add(this.lblMessage); - this.Controls.Add(this.progressBar); - this.Controls.Add(this.btnStart); - this.Controls.Add(this.grpOrganization); - this.Controls.Add(this.btnBrowseOU); - this.Controls.Add(this.txtOU); - this.Controls.Add(this.lblOU); - this.Controls.Add(this.btnBrowseSpace); - this.Controls.Add(this.txtSpace); - this.Controls.Add(this.lblSpace); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(630, 500); - this.Name = "ApplicationForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "WebsitePanel Enterprise Import Tool"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OnFormClosing); - this.grpOrganization.ResumeLayout(false); - this.grpOrganization.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.lvUsers.FullRowSelect = true; + this.lvUsers.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.lvUsers.Location = new System.Drawing.Point(19, 108); + this.lvUsers.MultiSelect = false; + this.lvUsers.Name = "lvUsers"; + this.lvUsers.Size = new System.Drawing.Size(551, 167); + this.lvUsers.SmallImageList = this.images; + this.lvUsers.TabIndex = 4; + this.lvUsers.UseCompatibleStateImageBehavior = false; + this.lvUsers.View = System.Windows.Forms.View.Details; + // + // columnHeader1 + // + this.columnHeader1.Text = "Name"; + this.columnHeader1.Width = 238; + // + // columnHeader2 + // + this.columnHeader2.Text = "Email"; + this.columnHeader2.Width = 166; + // + // columnHeader3 + // + this.columnHeader3.Text = "Type"; + this.columnHeader3.Width = 124; + // + // images + // + this.images.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("images.ImageStream"))); + this.images.TransparentColor = System.Drawing.Color.Transparent; + this.images.Images.SetKeyName(0, "UserSmallIcon.ico"); + this.images.Images.SetKeyName(1, "contact.ico"); + this.images.Images.SetKeyName(2, "DL.ico"); + // + // txtOrgName + // + this.txtOrgName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtOrgName.Location = new System.Drawing.Point(155, 45); + this.txtOrgName.Name = "txtOrgName"; + this.txtOrgName.Size = new System.Drawing.Size(415, 20); + this.txtOrgName.TabIndex = 3; + // + // lblOrgName + // + this.lblOrgName.Location = new System.Drawing.Point(19, 48); + this.lblOrgName.Name = "lblOrgName"; + this.lblOrgName.Size = new System.Drawing.Size(130, 23); + this.lblOrgName.TabIndex = 2; + this.lblOrgName.Text = "Organization Name:"; + // + // txtOrgId + // + this.txtOrgId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtOrgId.Location = new System.Drawing.Point(155, 19); + this.txtOrgId.Name = "txtOrgId"; + this.txtOrgId.ReadOnly = true; + this.txtOrgId.Size = new System.Drawing.Size(415, 20); + this.txtOrgId.TabIndex = 1; + // + // lblOrgId + // + this.lblOrgId.Location = new System.Drawing.Point(19, 22); + this.lblOrgId.Name = "lblOrgId"; + this.lblOrgId.Size = new System.Drawing.Size(130, 23); + this.lblOrgId.TabIndex = 0; + this.lblOrgId.Text = "Organization Id:"; + // + // btnStart + // + this.btnStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnStart.Location = new System.Drawing.Point(524, 461); + this.btnStart.Name = "btnStart"; + this.btnStart.Size = new System.Drawing.Size(75, 23); + this.btnStart.TabIndex = 9; + this.btnStart.Text = "Start"; + this.btnStart.UseVisualStyleBackColor = true; + this.btnStart.Click += new System.EventHandler(this.OnImportClick); + // + // progressBar + // + this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.progressBar.Location = new System.Drawing.Point(15, 427); + this.progressBar.Name = "progressBar"; + this.progressBar.Size = new System.Drawing.Size(584, 23); + this.progressBar.TabIndex = 8; + // + // lblMessage + // + this.lblMessage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.lblMessage.Location = new System.Drawing.Point(12, 401); + this.lblMessage.Name = "lblMessage"; + this.lblMessage.Size = new System.Drawing.Size(590, 23); + this.lblMessage.TabIndex = 7; + // + // ApplicationForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(614, 496); + this.Controls.Add(this.lblMessage); + this.Controls.Add(this.progressBar); + this.Controls.Add(this.btnStart); + this.Controls.Add(this.grpOrganization); + this.Controls.Add(this.btnBrowseOU); + this.Controls.Add(this.txtOU); + this.Controls.Add(this.lblOU); + this.Controls.Add(this.btnBrowseSpace); + this.Controls.Add(this.txtSpace); + this.Controls.Add(this.lblSpace); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MinimumSize = new System.Drawing.Size(630, 500); + this.Name = "ApplicationForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "WebsitePanel Enterprise Import Tool"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OnFormClosing); + this.grpOrganization.ResumeLayout(false); + this.grpOrganization.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -346,6 +369,8 @@ namespace WebsitePanel.Import.Enterprise private System.Windows.Forms.RadioButton rbImport; internal System.Windows.Forms.Button btnSelectAll; internal System.Windows.Forms.Button btnDeselectAll; + private System.Windows.Forms.ComboBox cbMailboxPlan; + private System.Windows.Forms.Label lblMailnoxPlan; } } diff --git a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.cs b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.cs index deefb00d..6201cc35 100644 --- a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.cs +++ b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2011, Outercurve Foundation. +// Copyright (c) 2014, Outercurve Foundation. // All rights reserved. // // Redistribution and use in source and binary forms, with or without modification, @@ -129,6 +129,30 @@ namespace WebsitePanel.Import.Enterprise } } + private void BindMailboxPlans(string orgId) + { + cbMailboxPlan.Items.Clear(); + cbMailboxPlan.Items.Add(""); + cbMailboxPlan.SelectedIndex = 0; + + Organization org = OrganizationController.GetOrganizationById(orgId); + + if (org == null) + { + List orgs = ExchangeServerController.GetExchangeOrganizations(1, false); + if (orgs.Count > 0) + org = orgs[0]; + } + + if (org != null) + { + int itemId = org.Id; + List plans = ExchangeServerController.GetExchangeMailboxPlans(itemId, false); + cbMailboxPlan.Items.AddRange(plans.ToArray()); + } + + } + private void LoadOrganizationData(DirectoryEntry parent) { string orgId = (string)parent.Properties["name"].Value; @@ -147,6 +171,9 @@ namespace WebsitePanel.Import.Enterprise rbImport.Checked = false; txtOrgName.Text = orgId; } + + BindMailboxPlans(orgId); + LoadOrganizationAccounts(parent); } @@ -326,6 +353,16 @@ namespace WebsitePanel.Import.Enterprise Global.OrganizationName = txtOrgName.Text; Global.ImportAccountsOnly = rbImport.Checked; Global.HasErrors = false; + + Global.defaultMailboxPlanId = 0; + if (cbMailboxPlan.SelectedItem!=null) + { + ExchangeMailboxPlan plan = cbMailboxPlan.SelectedItem as ExchangeMailboxPlan; + if (plan != null) + Global.defaultMailboxPlanId = plan.MailboxPlanId; + + } + importer.Initialize(this.username, this); importer.Start(); diff --git a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.resx b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.resx index 687492b2..c90fffd6 100644 --- a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.resx +++ b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/ApplicationForm.resx @@ -112,79 +112,79 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM - DQAAAk1TRnQBSQFMAgEBAwEAAQwBAAEMAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABI + DQAAAk1TRnQBSQFMAgEBAwEAAVwBAAFcAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEgBgABEGIAAa0BsgG1Af8BrQGuAa0B/wGtAa4BrQH/AaUBpgGlAf8BnAGeAaUB/wGc AZoBnAH/AZQBlgGUAf8BjAGOAZQB/wGMAYoBjAH/IAABrQGyAbUB/wGtAa4BrQH/Aa0BrgGtAf8BpQGm - AaUB/wGcAZ4BpQH/AZwBmgGcAf8BlAGWAZQB/wGMAY4BlAH/AYwBigGMAf8BjAFtAWcB/1AAAxgBIQNN - AZEDWAHBA2EB5gFqAWMBVwH8A2EB5gNYAcEDTAGQAygBPSAAAa0BsgG1Hf8BlAGWAZQB/yAAAa0BsgG1 - Hf8BlAGWAZQB/wG1AZIBZwH/AYQBaQFfAf9IAAMDAQQDXAHNAagBkwFHAf0B5gHLAbQB/wHeAbcBkAH/ - AeMBuwGUAf8B4AG6AZQB/wHOAasBiAH/AbgBmQFcAf8DWgHFIAABrQGyAbUF/wHvAesB5wH/Ac4BywHO + AaUB/wGcAZ4BpQH/AZwBmgGcAf8BlAGWAZQB/wGMAY4BlAH/AYwBigGMAf8BjAFjAV0B/1AAAxgBIQNN + AZEDWAHBA2EB5gFgAVkBRQH8A2EB5gNYAcEDTAGQAygBPSAAAa0BsgG1Hf8BlAGWAZQB/yAAAa0BsgG1 + Hf8BlAGWAZQB/wG1AZIBXQH/AYQBXwFVAf9IAAMDAQQDXAHNAagBkwFAAf0B5gHLAbQB/wHeAbcBkAH/ + AeMBuwGUAf8B4AG6AZQB/wHOAasBiAH/AbgBmQFSAf8DWgHFIAABrQGyAbUF/wHvAesB5wH/Ac4BywHO Af8BvQG6Ab0B/wG1AbIBtQn/AZQBkgGUAf8gAAGtAbIBtQX/Ae8B6wHnAf8BzgHLAc4B/wG9AboBvQH/ - AbUBsgG1Cf8BlAGSAZQB/wHGAZ4BbwH/AYwBbQFfAf9IAAMEAQUDWQG+AcYBpQGFAf8B5gHQAb0B/wHi - Ab0BnAH/AeYBvwGXAf8B6AHDAZ8B/wHbAboBmAH/AcABnwFfAf8DXAHMEAABvQHDAbUB/wE8ATsBPAH/ - ATwBOwE8Af8BPAE7ATwB/wGtAbIBtRX/ATwBOwH3Af8BIwEmAdYB/wGUAZIBlAH/ATwBOwE8Af8BPAE7 - ATwB/wE8ATsBPAH/CAABVwGOAW8B/wFGAYoBZwH/AU4BigFnAf8BrQGyAbUV/wE+AT0B9wH/ASUBKAHW + AbUBsgG1Cf8BlAGSAZQB/wHGAZ4BZQH/AYwBYwFVAf9IAAMEAQUDWQG+AcYBpQGFAf8B5gHQAb0B/wHi + Ab0BnAH/AeYBvwGXAf8B6AHDAZ8B/wHbAboBmAH/AcABnwFVAf8DXAHMEAABvQHDAbUB/wEyATEBMgH/ + ATIBMQEyAf8BMgExATIB/wGtAbIBtRX/ATIBMQH3Af8BGQEcAdYB/wGUAZIBlAH/ATIBMQEyAf8BMgEx + ATIB/wEyATEBMgH/CAABTQGOAWUB/wE8AYoBXQH/AUQBigFdAf8BrQGyAbUV/wE0ATMB9wH/ARsBHgHW Af8BlAGSAZQB/wHeAbIBhAH/AZwBkgGEAf9LAAEBA1MBqgHZAbEBkAH/AeYB1AHBAf8B8wHSAbMB/wHq AcEBmAH/Ae0BzAGqAf8B4AHCAaQB/wHDAaMBggH/A14B3RAAAb0BwwG1C/8B9wH/Aa0BugG1Ff8BpQGi - AfcB/wGMAY4B3gH/AZQBkgGUAf8B7wHjAdYC/wH3Ae8B/wGcAZ4BlAH/BAABVwG6AYwB/wFfAcsBnAH/ - AU4BugGMAf8BhAHHAaUB/wGtAboBtRX/AaUBogH3Af8BjAGOAd4B/wGUAZIBlAH/Ac4BpgFvAf9MAAMB - AQIDAQECA2UB5QHQAcMBsgH/AcgBwwG7Af8B1wG3AZcB/wHrAcQBnQH/AeEBvgGbAf8BzgGmAV8B/wNN + AfcB/wGMAY4B3gH/AZQBkgGUAf8B7wHjAdYC/wH3Ae8B/wGcAZ4BlAH/BAABTQG6AYwB/wFVAcsBnAH/ + AUQBugGMAf8BhAHHAaUB/wGtAboBtRX/AaUBogH3Af8BjAGOAd4B/wGUAZIBlAH/Ac4BpgFlAf9MAAMB + AQIDAQECA2UB5QHQAcMBsgH/AcgBwwG7Af8B1wG3AZcB/wHrAcQBnQH/AeEBvgGbAf8BzgGmAVUB/wNN AZEQAAG9AcMBtQX/AfcB7wHnAf8B9wHvAecB/wGtAboBtQH/Aa0BsgG1Af8BrQGyAa0B/wGlAa4BrQH/ AaUBpgGlAf8BnAGiAZwB/wGcAZ4BlAH/AZwBlgGUAf8BlAGWAZQB/wH3Ae8B5wH/AfcB7wHnAf8BnAGe - AZQB/wQAAW8BwwGlAf8BZwG6AZQB/wFGAa4BhAH/AcYB4wHOAf8BrQG6AbUB/wGtAbIBtQH/Aa0BsgGt + AZQB/wQAAWUBwwGlAf8BXQG6AZQB/wE8Aa4BhAH/AcYB4wHOAf8BrQG6AbUB/wGtAbIBtQH/Aa0BsgGt Af8BpQGuAa0B/wGlAaYBpQH/AZwBogGcAf8BnAGeAZwB/wGcAZYBlAH/AZQBkgGUAf9XAAEBAx8BLQNc - AckBAAErAVwB/wEvAUkBgwH/AcYBpgGHAf8DYQHuA04BmAMHAQoQAAG9AcMBtQX/Ae8B3wHWAf8B1gG+ + AckBAAEhAVIB/wElAT8BgwH/AcYBpgGHAf8DYQHuA04BmAMHAQoQAAG9AcMBtQX/Ae8B3wHWAf8B1gG+ Aa0B/wHGAbIBpQH/AcYBsgGlAf8BzgG6AaUB/wHnAd8B1gH/AfcB7wHnAf8B9wHvAecB/wH3Ae8B5wH/ - AfcB7wHnAf8B9wHvAecB/wH3Ae8B5wH/AfcB7wHnAf8BnAGeAZQB/wQAAYQBwwGlAf8BbwHPAaUB/wFX - AboBjAH/Ab0B1wHOAf8BpQHDAbUB/wFOAaYBbwH/ASUBhgFGAf8BVwGGAYQB/wE2AVEBhAH/AQABMAFn - Af8BDAE9AW8B/wG9AaoBlAH/VwABAQMAAQEDEAEWA1ABmgEQATUBXAH/AQcBMQFcAf8DVQG1Az8BbAQA + AfcB7wHnAf8B9wHvAecB/wH3Ae8B5wH/AfcB7wHnAf8BnAGeAZQB/wQAAYQBwwGlAf8BZQHPAaUB/wFN + AboBjAH/Ab0B1wHOAf8BpQHDAbUB/wFEAaYBZQH/ARsBhgE8Af8BTQGGAYQB/wEsAUcBhAH/AQABJgFd + Af8BAgEzAWUB/wG9AaoBlAH/VwABAQMAAQEDEAEWA1ABmgEGASsBUgH/AQABJwFSAf8DVQG1Az8BbAQA AwIBAxAAAb0BwwG1Bf8BxgGuAZwR/wHWAb4BrQH/AfcB7wHnAf8B9wHvAecB/wH3Ae8B5wH/AfcB7wHn - Af8B9wHvAecB/wH3Ae8B5wH/AfcB7wHnAf8BnAGeAZQB/wgAAYwB2wGlAf8BVwGqAZQB/wFXAYIBvQH/ - AT4BXQFvAf8BVwGWAV8B/wGMAbYBpQH/ATYBYQGcAf8BLQFZAZQB/wE2AV0BjAH/AR0BRQFvAf9YAAMD - AQQDAgEDAyEBMAFYAl8B4wEsAVMBmwH/AScBTAGTAf8BFQE7AYEB/wMkATYYAAG9AcMBtQL/AvcB/wHG + Af8B9wHvAecB/wH3Ae8B5wH/AfcB7wHnAf8BnAGeAZQB/wgAAYwB2wGlAf8BTQGqAZQB/wFNAYIBvQH/ + ATQBUwFlAf8BTQGWAVUB/wGMAbYBpQH/ASwBVwGcAf8BIwFPAZQB/wEsAVMBjAH/ARMBOwFlAf9YAAMD + AQQDAgEDAyEBMAFYAl8B4wEiAUkBmwH/AR0BQgGTAf8BCwExAYEB/wMkATYYAAG9AcMBtQL/AvcB/wHG Aa4BnBH/Ad4BwwG9Af8B9wHvAecB/wHGAbIBpQH/AcYBsgGlAf8BxgGyAaUB/wHGAbIBpQH/AcYBsgGl - Af8B9wHvAecB/wGcAZ4BlAH/DAABNgFpAW8B/wFXAYIBvQH/AT4BXQFvAf8D9wH/A/cB/wFvAZ4BxgH/ - AVcBigG1Af8BRgFxAaUB/wE2AV0BjAH/WAADBAEGBAADRwGCA2IB9gFKAZABtgH/ATsBgQGnAf8BIQFJ + Af8B9wHvAecB/wGcAZ4BlAH/DAABLAFfAWUB/wFNAYIBvQH/ATQBUwFlAf8D9wH/A/cB/wFlAZ4BxgH/ + AU0BigG1Af8BPAFnAaUB/wEsAVMBjAH/WAADBAEGBAADRwGCA2IB9gFAAZABtgH/ATEBgQGnAf8BFwE/ AZAB/wNSAaEDBQEHFAABvQHDAbUC/wL3Af8BzgG6AaUR/wHeAcMBvQH/AfcB7wHnAf8B1gHDAbUB/wHW - AccBvQH/AdYBxwG9Af8B1gHHAb0B/wHWAcMBtQH/AfcB7wHnAf8BnAGeAZQB/wgAAWcBhgGUAf8BPgFt - AZwB/wGMAbIB3gH/AYQBqgHWAf8BVwFlAYQB/wGMAZYBpQH/AZQBugHeAf8BhAGuAdYB/wFXAZIBvQH/ - AS0BWQGMAf8BXwFlAWcB/1QAAwQBBgMAAQEDPwFsAVwBbwF2AfgBggGoAc4B/wFKAZEBuAH/ASwBTgGS - Af8BEQEhATEB/wMkATUUAAG9AcMBtQP/AfcB/wHOAcMBtRH/AdYBxwG9Af8B9wHvAecB/wHWAcMBtQH/ - AdYBwwG1Af8B1gHDAbUB/wHWAccBvQH/AdYBwwG1Av8B9wHvAf8BnAGeAZQB/wgAAU4BjgGlAf8BlAG2 - Ad4B/wG1AdsC/wGlAc8C/wFXAXEBnAH/AaUBtgHGAf8BvQHbAv8BnAHHAe8B/wFfAZ4BzgH/AS0BOQFG - Af8BLQEsASUB/1QAAwEBAgMAAQEBwwHQAdoB/wFqAXoBhAH5AZsBvwHlAf8BUwGdAccB/wErAT8BVAH/ - ARMBDwEMAf8DMgFQFAABvQHDAbUF/wHvAd8B1gH/AcYBsgGlAf8BxgGyAaUB/wHGAbIBpQH/AcYBrgGc - Af8B7wHfAdYB/wH3Ae8B5wH/AcYBsgGlAf8BxgGyAaUB/wHGAbIBpQH/AcYBsgGlAf8BxgGyAaUC/wH3 - Ae8B/wGcAZYBlAH/CAABXwGeAb0B/wGtAc8B5wH/Ad4B+wL/AaUBywH3Af8BXwGeAc4B/wHeAecB7wH/ - Aa0BvgHWAf8BhAGeAb0B/wFXAYIBnAH/AS0BLAEtAf8BRgFBAT4B/1cAAQEIAAJZAVwB9QFfAZIBpgH/ - AUkBXAGOAf8BLwEyATYB/wEZARgBFwH/AyQBNRQAAb0BwwG1Bf8B9wHvAecC/wHvAecB/wH3Ae8B5wL/ - AfcB7wH/AfcB7wHnAf8B9wHvAecH/wH3Av8C9wH/A/cB/wH3AfMB7wH/AfcB7wHnA/8B9wH/AZwBngGU - Af8IAAFvAaoBvQH/AWcBrgHGAf8BnAHDAc4B/wGUAbYB3gH/AUYBaQGcAf8EAAHGAb4BvQH/AYQBcQFv - Af8BVwFVAU4B/wFXAVEBTgH/XwABAQQAA0wBkgNiAekBQwE/ATwB/ANZAfIDUQGcAwQBBRQAAb0BwwG1 - Hf8BnAGeAZQB/wG9Ab4BtQH/Ab0BvgG1Af8BvQHDAbUB/wG9Ab4BtQH/Ab0BvgG1Af8BvQG+AbUB/wG9 - Ab4BtQH/CAABrQHDAcYB/wGEAccB1gH/AVcBngG1Af8BTgGWAbUB/wEtAV0BbwH/bAADCgENBAADCgEN - BAADFQEdAygBPAMeASscAAG9AcMBtQH/Ab0BwwG1Af8BvQHDAbUB/wG9AcMBtQH/Ab0BwwG1Af8BvQHD - AbUB/wG9AcMBtQH/Ab0BwwG1Af8BvQHDAbUB/ygAAc4C7wH/AaUB4wH3Af8BhAHLAdYB/wFvAbIBvQH/ - /wBlAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAC/wHwAQcB+AEBAgAB4AEP - AfABBwH4AwABwAEPAfABBwH4AwABwAEPAgABwAMAAcABDwIAAYABAQIAAcABDwIAAYABAwIAAeABDwIA - AYABBwIAAcABLwIAAcABDwIAAcABPwIAAeABDwIAAdABHwIAAcABBwIAAcABHwIAAcABBwIAAcABHwIA - AcABBwIAAdgBHwIAAcEBDwIAAegBHwIAAcEB/wIAAdQBfwEAAX8B4QH/AgAG/wIACw== + AccBvQH/AdYBxwG9Af8B1gHHAb0B/wHWAcMBtQH/AfcB7wHnAf8BnAGeAZQB/wgAAV0BhgGUAf8BNAFj + AZwB/wGMAbIB3gH/AYQBqgHWAf8BTQFbAYQB/wGMAZYBpQH/AZQBugHeAf8BhAGuAdYB/wFNAZIBvQH/ + ASMBTwGMAf8BVQFbAV0B/1QAAwQBBgMAAQEDPwFsAVwBXQFrAfgBggGoAc4B/wFAAZEBuAH/ASIBRAGS + Af8BBwEXAScB/wMkATUUAAG9AcMBtQP/AfcB/wHOAcMBtRH/AdYBxwG9Af8B9wHvAecB/wHWAcMBtQH/ + AdYBwwG1Af8B1gHDAbUB/wHWAccBvQH/AdYBwwG1Av8B9wHvAf8BnAGeAZQB/wgAAUQBjgGlAf8BlAG2 + Ad4B/wG1AdsC/wGlAc8C/wFNAWcBnAH/AaUBtgHGAf8BvQHbAv8BnAHHAe8B/wFVAZ4BzgH/ASMBLwE8 + Af8BIwEiARsB/1QAAwEBAgMAAQEBwwHQAdoB/wJqAXEB+QGbAb8B5QH/AUkBnQHHAf8BIQE1AUoB/wEJ + AQUBAgH/AzIBUBQAAb0BwwG1Bf8B7wHfAdYB/wHGAbIBpQH/AcYBsgGlAf8BxgGyAaUB/wHGAa4BnAH/ + Ae8B3wHWAf8B9wHvAecB/wHGAbIBpQH/AcYBsgGlAf8BxgGyAaUB/wHGAbIBpQH/AcYBsgGlAv8B9wHv + Af8BnAGWAZQB/wgAAVUBngG9Af8BrQHPAecB/wHeAfsC/wGlAcsB9wH/AVUBngHOAf8B3gHnAe8B/wGt + Ab4B1gH/AYQBngG9Af8BTQGCAZwB/wEjASIBIwH/ATwBNwE0Af9XAAEBCAADWQH1AVUBkgGmAf8BPwFS + AY4B/wElASgBLAH/AQ8BDgENAf8DJAE1FAABvQHDAbUF/wH3Ae8B5wL/Ae8B5wH/AfcB7wHnAv8B9wHv + Af8B9wHvAecB/wH3Ae8B5wf/AfcC/wL3Af8D9wH/AfcB8wHvAf8B9wHvAecD/wH3Af8BnAGeAZQB/wgA + AWUBqgG9Af8BXQGuAcYB/wGcAcMBzgH/AZQBtgHeAf8BPAFfAZwB/wQAAcYBvgG9Af8BhAFnAWUB/wFN + AUsBRAH/AU0BRwFEAf9fAAEBBAADTAGSA2IB6QE3ATUBMgH8A1kB8gNRAZwDBAEFFAABvQHDAbUd/wGc + AZ4BlAH/Ab0BvgG1Af8BvQG+AbUB/wG9AcMBtQH/Ab0BvgG1Af8BvQG+AbUB/wG9Ab4BtQH/Ab0BvgG1 + Af8IAAGtAcMBxgH/AYQBxwHWAf8BTQGeAbUB/wFEAZYBtQH/ASMBUwFlAf9sAAMKAQ0EAAMKAQ0EAAMV + AR0DKAE8Ax4BKxwAAb0BwwG1Af8BvQHDAbUB/wG9AcMBtQH/Ab0BwwG1Af8BvQHDAbUB/wG9AcMBtQH/ + Ab0BwwG1Af8BvQHDAbUB/wG9AcMBtQH/KAABzgLvAf8BpQHjAfcB/wGEAcsB1gH/AWUBsgG9Af//AGUA + AUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAL/AfABBwH4AQECAAHgAQ8B8AEH + AfgDAAHAAQ8B8AEHAfgDAAHAAQ8CAAHAAwABwAEPAgABgAEBAgABwAEPAgABgAEDAgAB4AEPAgABgAEH + AgABwAEvAgABwAEPAgABwAE/AgAB4AEPAgAB0AEfAgABwAEHAgABwAEfAgABwAEHAgABwAEfAgABwAEH + AgAB2AEfAgABwQEPAgAB6AEfAgABwQH/AgAB1AF/AQABfwHhAf8CAAb/AgAL - + AAABAAoAAAAAAAEACADKTwAApgAAADAwAAABAAgAqA4AAHBQAAAgIAAAAQAIAKgIAAAYXwAAGBgAAAEA diff --git a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/Global.cs b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/Global.cs index c2c1a389..539d7e3d 100644 --- a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/Global.cs +++ b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/Global.cs @@ -81,6 +81,7 @@ namespace WebsitePanel.Import.Enterprise public static string ErrorMessage; public static bool ImportAccountsOnly; public static bool HasErrors; + public static int defaultMailboxPlanId; } } diff --git a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/OrganizationImporter.cs b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/OrganizationImporter.cs index 7044ddeb..3068f97d 100644 --- a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/OrganizationImporter.cs +++ b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/OrganizationImporter.cs @@ -51,7 +51,6 @@ namespace WebsitePanel.Import.Enterprise private ProgressBar progressBar; private ApplicationForm appForm; private Button btnImport; - private Thread thread; @@ -826,7 +825,7 @@ namespace WebsitePanel.Import.Enterprise } } - UpdateExchangeAccount(userId, accountName, accountType, displayName, email, false, string.Empty, samName, string.Empty); + UpdateExchangeAccount(userId, accountName, accountType, displayName, email, false, string.Empty, samName, string.Empty, Global.defaultMailboxPlanId); string defaultEmail = (string)entry.Properties["extensionAttribute3"].Value; @@ -987,7 +986,7 @@ namespace WebsitePanel.Import.Enterprise private static void UpdateExchangeAccount(int accountId, string accountName, ExchangeAccountType accountType, string displayName, string primaryEmailAddress, bool mailEnabledPublicFolder, - string mailboxManagerActions, string samAccountName, string accountPassword) + string mailboxManagerActions, string samAccountName, string accountPassword, int mailboxPlanId) { DataProvider.UpdateExchangeAccount(accountId, accountName, @@ -997,7 +996,7 @@ namespace WebsitePanel.Import.Enterprise mailEnabledPublicFolder, mailboxManagerActions, samAccountName, - CryptoUtils.Encrypt(accountPassword), 0, -1, string.Empty, false); + CryptoUtils.Encrypt(accountPassword), mailboxPlanId , -1, string.Empty, false); } } } diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailboxPlan.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailboxPlan.cs index 03435769..72e529c0 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailboxPlan.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailboxPlan.cs @@ -38,6 +38,15 @@ namespace WebsitePanel.Providers.HostedSolution int itemId; int mailboxPlanId; string mailboxPlan; + + public override string ToString() + { + if (mailboxPlan != null) + return mailboxPlan; + + return base.ToString(); + } + int mailboxSizeMB; int maxRecipients; int maxSendMessageSizeKB; @@ -63,7 +72,6 @@ namespace WebsitePanel.Providers.HostedSolution string litigationHoldUrl; string litigationHoldMsg; - public int ItemId { get { return this.itemId; }