Merge: dev to default

This commit is contained in:
ptsurbeleu 2012-08-01 07:34:56 -07:00
commit 19d6bae05e
1884 changed files with 65140 additions and 30708 deletions

View file

@ -2,15 +2,15 @@
<ModulesData>
<ModuleData id="UserMenu">
<MenuItem pageID="UserCustomers" roles="Administrator,Reseller"/>
<MenuItem pageID="UserSpaces" roles="Administrator,Reseller,User"/>
<MenuItem pageID="HostingPlans" roles="Administrator,Reseller"/>
<MenuItem pageID="HostingAddons" roles="Administrator,Reseller"/>
<MenuItem pageID="UserPeers" roles="Administrator,Reseller,User"/>
<MenuItem pageID="UserTasks" roles="Administrator,Reseller,User"/>
<MenuItem pageID="AuditLog" roles="Administrator,Reseller,User"/>
<MenuItem pageID="ecOnlineStore" roles="Reseller,User" ecuser="true" />
<MenuItem pageID="ecEcommerceAdmin" roles="Administrator,Reseller" ecadmin="true">
<MenuItem pageID="UserCustomers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" selectedUserContext="Administrator,Reseller"/>
<MenuItem pageID="UserSpaces" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" selectedUserContext="Administrator,Reseller,User"/>
<MenuItem pageID="HostingPlans" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" selectedUserContext="Administrator,Reseller"/>
<MenuItem pageID="HostingAddons" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" selectedUserContext="Administrator,Reseller"/>
<MenuItem pageID="UserPeers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" selectedUserContext="Administrator,Reseller,User"/>
<MenuItem pageID="UserTasks" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" selectedUserContext="Administrator,Reseller,User"/>
<MenuItem pageID="AuditLog" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" selectedUserContext="Administrator,Reseller,User"/>
<MenuItem pageID="ecOnlineStore" roles="Reseller,ResellerCSR,ResellerHelpdesk,User" selectedUserContext="Reseller,User" ecuser="true" />
<MenuItem pageID="ecEcommerceAdmin" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" selectedUserContext="Administrator,Reseller,User" ecadmin="true">
<MenuItems>
<MenuItem pageID="ecEcommerceSettings" ecommerce="true" />
<MenuItem pageID="ecBillingCycles" />
@ -24,7 +24,7 @@
<MenuItem pageID="ecCustomersServices" />
</MenuItems>
</MenuItem>
<MenuItem pageID="ecMyEcommerce" ecuser="true" roles="Reseller,User">
<MenuItem pageID="ecMyEcommerce" ecuser="true" roles="Reseller,ResellerCSR,ResellerHelpdesk,User" selectedUserContext="Reseller,User">
<MenuItems>
<MenuItem pageID="ecPaymentProfile" />
<MenuItem pageID="ecMyPayments" />
@ -55,6 +55,7 @@
<MenuItem pageID="SpaceMsSql2000" resourceGroup="MsSQL2000"/>
<MenuItem pageID="SpaceMsSql2005" resourceGroup="MsSQL2005"/>
<MenuItem pageID="SpaceMsSql2008" resourceGroup="MsSQL2008"/>
<MenuItem pageID="SpaceMsSql2012" resourceGroup="MsSQL2012"/>
<MenuItem pageID="SpaceMySql4" resourceGroup="MySQL4"/>
<MenuItem pageID="SpaceMySql5" resourceGroup="MySQL5"/>
</MenuItems>
@ -67,7 +68,6 @@
</MenuItem>
<MenuItem pageID="SpaceVPS" resourceGroup="VPS"/>
<MenuItem pageID="SpaceVPSForPC" resourceGroup="VPSForPC"/>
<MenuItem pageID="SpaceExchangeHostedEdition" resourceGroup="ExchangeHostedEdition"/>
<MenuItem pageID="SpaceExchangeServer" resourceGroup="Hosted Organizations"/>
<MenuItem pageID="SpaceSharedSSL" resourceGroup="OS" quota="Web.SharedSSL"/>
<MenuItem pageID="SpaceAdvancedStatistics" resourceGroup="Statistics"/>
@ -97,6 +97,7 @@
<MenuItem pageID="SpaceMsSql2000" resourceGroup="MsSQL2000"/>
<MenuItem pageID="SpaceMsSql2005" resourceGroup="MsSQL2005"/>
<MenuItem pageID="SpaceMsSql2008" resourceGroup="MsSQL2008"/>
<MenuItem pageID="SpaceMsSql2012" resourceGroup="MsSQL2012"/>
<MenuItem pageID="SpaceMySql4" resourceGroup="MySQL4"/>
<MenuItem pageID="SpaceMySql5" resourceGroup="MySQL5"/>
<MenuItem pageID="SpaceOdbc" resourceGroup="OS" quota="OS.ODBC"/>
@ -119,7 +120,6 @@
</Icon>
<Icon pageID="SpaceVPS" resourceGroup="VPS" imageUrl="images/vps/servers_48.png" />
<Icon pageID="SpaceVPSForPC" resourceGroup="VPSForPC" imageUrl="images/vps/icon-home-botbar-cloud.png" />
<Icon pageID="SpaceExchangeHostedEdition" resourceGroup="ExchangeHostedEdition" imageUrl="icons/enterprise.png"/>
<Icon pageID="SpaceExchangeServer" resourceGroup="Hosted Organizations" imageUrl="icons/enterprise.png"/>
<Icon pageID="SpaceWebApplicationsGallery" resourceGroup="Web" quota="Web.WebAppGallery" imageUrl="icons/dvd_disc_48.png"/>
<Icon pageID="SpaceApplicationsInstaller" resourceGroup="OS" quota="OS.AppInstaller" imageUrl="icons/dvd_disc_48.png"/>

View file

@ -3,7 +3,7 @@
<!-- Display Settings -->
<PortalName>WebsitePanel</PortalName>
<!-- Enterprise Server -->
<EnterpriseServer>http://localhost:9002</EnterpriseServer>
<EnterpriseServer>http://localhost:9005</EnterpriseServer>
<!-- General Settings -->
<CultureCookieName>UserCulture</CultureCookieName>
<ThemeCookieName>UserTheme</ThemeCookieName>

View file

@ -174,7 +174,8 @@
<Control key="edit_service" src="WebsitePanel/ServersEditService.ascx" title="ServiceProperties" type="View" icon="computer_config_48.png" />
<Control key="edit_termservices" src="WebsitePanel/ServersEditTerminalConnections.ascx" title="ManageTerminalConnections" type="View" icon="windows_window_zoom_48.png" />
<Control key="edit_winservices" src="WebsitePanel/ServersEditWindowsServices.ascx" title="ManageWindowsServices" type="View" icon="windows_window_config_48.png" />
<Control key="backup" src="WebsitePanel/BackupWizard.ascx" title="BackupServer" type="View" />
<Control key="edit_platforminstaller" src="WebsitePanel/ServersEditWebPlatformInstaller.ascx" title="ManagePlatformInstaller" type="View" icon="computer_config_48.png" />
<Control key="backup" src="WebsitePanel/BackupWizard.ascx" title="BackupServer" type="View" />
<Control key="restore" src="WebsitePanel/RestoreWizard.ascx" title="RestoreServer" type="View" />
<Control key="edit_htaccessfolder" src="WebsitePanel/WebSitesEditHeliconApeFolder.ascx" title="HeliconApeFolderProperties" type="View" />
</Controls>
@ -486,7 +487,10 @@
<Control key="storage_usage_details" src="WebsitePanel/ExchangeServer/ExchangeStorageUsageBreakdown.ascx" title="ExchangeStorageUsageBreakdown" type="View" />
<Control key="storage_limits" src="WebsitePanel/ExchangeServer/ExchangeStorageLimits.ascx" title="ExchangeStorageLimits" type="View" />
<Control key="activesync_policy" src="WebsitePanel/ExchangeServer/ExchangeActiveSyncSettings.ascx" title="ExchangeActiveSyncSettings" type="View" />
<Control key="CRMOrganizationDetails" src="WebsitePanel/CRM/CRMOrganizationDetails.ascx" title="ExchangeActiveSyncSettings" type="View" />
<Control key="mailboxplans" src="WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx" title="ExchangeMailboxPlans" type="View" />
<Control key="add_mailboxplan" src="WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx" title="ExchangeAddMailboxPlan" type="View" />
<Control key="CRMOrganizationDetails" src="WebsitePanel/CRM/CRMOrganizationDetails.ascx" title="ExchangeActiveSyncSettings" type="View" />
<Control key="CRMUsers" src="WebsitePanel/CRM/CRMUsers.ascx" title="CRM Users" type="View" />
<Control key="CRMUserRoles" src="WebsitePanel/CRM/CRMUserRoles.ascx" title="CRM User Roles" type="View" />
<Control key="create_crm_user" src="WebsitePanel/CRM/CreateCRMUser.ascx" title="Create CRM User" type="View" />
@ -508,7 +512,15 @@
<Control key="create_new_ocs_user" src="WebsitePanel/OCS/CreateOCSUser.ascx" title="Create New OCS User" type="View" />
<Control key="edit_ocs_user" src="WebsitePanel/OCS/EditOCSUser.ascx" title="Edit OCS User" type="View" />
</Controls>
<Control key="lync_users" src="WebsitePanel/Lync/LyncUsers.ascx" title="Lync Users" type="View" />
<Control key="create_new_lync_user" src="WebsitePanel/Lync/LyncCreateUser.ascx" title="Create New Lync User" type="View" />
<Control key="lync_userplans" src="WebsitePanel/Lync/LyncUserPlans.ascx" title="LyncUserPlans" type="View" />
<Control key="lync_federationdomains" src="WebsitePanel/Lync/LyncFederationDomains.ascx" title="LyncFederationDomains" type="View" />
<Control key="add_lyncfederation_domain" src="WebsitePanel/Lync/LyncAddFederationDomain.ascx" title="LyncAddFederationDomain" type="View" />
<Control key="add_lyncuserplan" src="WebsitePanel/Lync/LyncAddLyncUserPlan.ascx" title="LyncAddLyncUserPlan" type="View" />
<Control key="edit_lync_user" src="WebsitePanel/Lync/LyncEditUser.ascx" title="Edit Lync User" type="View" />
</Controls>
</ModuleDefinition>
<ModuleDefinition id="VPS">
@ -580,17 +592,4 @@
</Controls>
</ModuleDefinition>
<ModuleDefinition id="ExchangeHostedEdition">
<Controls>
<Control key="" src="WebsitePanel/ExchangeHostedEdition/OrganizationDetails.ascx" title="HostedExchangeOrganizationDetails" type="View" />
<Control key="create_org" src="WebsitePanel/ExchangeHostedEdition/CreateOrganization.ascx" title="HostedExchangeCreateOrganization" type="View" />
<Control key="update_org_quotas" src="WebsitePanel/ExchangeHostedEdition/UpdateOrganizationQuotas.ascx" title="HostedExchangeUpdateOrganizationQuotas" type="View" />
<Control key="update_org_catchall" src="WebsitePanel/ExchangeHostedEdition/UpdateOrganizationCatchAll.ascx" title="HostedExchangeUpdateOrganizationCatchAll" type="View" />
<Control key="update_org_plan" src="WebsitePanel/ExchangeHostedEdition/UpdateOrganizationServicePlan.ascx" title="HostedExchangeUpdateOrganizationServicePlan" type="View" />
<Control key="add_org_domain" src="WebsitePanel/ExchangeHostedEdition/AddOrganizationDomain.ascx" title="HostedExchangeAddOrganizationDomain" type="View" />
<Control key="delete_org" src="WebsitePanel/ExchangeHostedEdition/DeleteOrganization.ascx" title="HostedExchangeDeleteOrganization" type="View" />
</Controls>
</ModuleDefinition>
</ModuleDefinitions>

View file

@ -9,25 +9,25 @@
</Content>
</Page>
<Page name="LoggedUserDetails" roles="Administrator,Reseller,User" hidden="True" skin="Edit.ascx">
<Page name="LoggedUserDetails" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Edit.ascx">
<Content id="ContentPane">
<Module moduleDefinitionID="LoggedUserDetails" title="LoggedUserDetails" icon="user_write_48.png" container="Edit.ascx" />
</Content>
</Page>
<Page name="SearchUsers" roles="Administrator,Reseller,User" hidden="True" skin="Browse1.ascx">
<Page name="SearchUsers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Browse1.ascx">
<Content id="ContentPane">
<Module moduleDefinitionID="SearchUsers" title="SearchUsers" icon="user_zoom_48.png" container="Edit.ascx" />
</Content>
</Page>
<Page name="SearchSpaces" roles="Administrator,Reseller,User" hidden="True" skin="Browse1.ascx">
<Page name="SearchSpaces" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Browse1.ascx">
<Content id="ContentPane">
<Module moduleDefinitionID="SearchSpaces" title="SearchSpaces" icon="sphere_zoom_48.png" container="Edit.ascx" />
</Content>
</Page>
<Page name="Home" roles="Administrator,Reseller,User" skin="Browse3.ascx">
<Page name="Home" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" skin="Browse3.ascx">
<Content id="LeftPane">
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
<ModuleData ref="UserMenu"/>
@ -35,27 +35,19 @@
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="UserCustomersSummary" title="UserCustomersSummary" container="Browse.ascx" icon="group_48.png"/>
<Module moduleDefinitionID="UserSpaces" title="UserSpaces" container="Browse.ascx" roles="Administrator,Reseller" icon="sphere_48.png">
<Module moduleDefinitionID="UserSpaces" title="UserSpaces" container="Browse.ascx" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" icon="sphere_48.png">
<ModuleData ref="SpaceIcons"/>
</Module>
<Module moduleDefinitionID="UserNotes" title="UserNotes" container="Browse.ascx" roles="Administrator,Reseller" icon="notes_48.png" />
<!--Module moduleDefinitionID="TextHTML" title="Test Text Module" container="Clear.ascx" roles="Administrator,Reseller">
<ModuleData>
<Content resourcekey="" template="true">
<![CDATA[<div class="Normal">Hello #user.FirstName#!</div>]]>
</Content>
</ModuleData>
</Module-->
<Module moduleDefinitionID="UserNotes" title="UserNotes" container="Browse.ascx" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" icon="notes_48.png" />
</Content>
<Content id="RightPane">
<Module moduleDefinitionID="UserDetails" title="UserDetails" container="Clear.ascx" />
<Module moduleDefinitionID="UserResellerSettings" title="UserResellerSettings" container="Clear.ascx" roles="Administrator,Reseller" />
<!--Module moduleDefinitionID="UserTools" title="UserTools" container="Clear.ascx" /-->
</Content>
</Page>
<!-- User Account Menu Pages -->
<Page name="UserCustomers" roles="Administrator,Reseller" hidden="True">
<Page name="UserCustomers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
<ModuleData ref="UserMenu"/>
@ -66,62 +58,62 @@
</Content>
</Page>
<Page name="UserSpaces" roles="Administrator,Reseller,User" hidden="True">
<Page name="UserSpaces" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx" >
<ModuleData ref="UserMenu"/>
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="UserSpaces" title="UserSpaces" icon="sphere_48.png" readOnlyRoles="PlatformHelpdesk,ResellerHelpdesk,User" />
</Content>
</Page>
<Page name="UserPeers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
<ModuleData ref="UserMenu"/>
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="UserSpaces" title="UserSpaces" icon="sphere_48.png" />
<Module moduleDefinitionID="UserPeers" title="UserPeers" icon="motion_blur_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
</Content>
</Page>
<Page name="UserPeers" roles="Administrator,Reseller,User" hidden="True">
<Page name="HostingPlans" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
<ModuleData ref="UserMenu"/>
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="UserPeers" title="UserPeers" icon="motion_blur_48.png" />
<Module moduleDefinitionID="HostingPlans" title="HostingPlans" icon="inventory_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
</Content>
</Page>
<Page name="HostingPlans" roles="Administrator,Reseller" hidden="True">
<Page name="HostingAddons" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
<ModuleData ref="UserMenu"/>
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="HostingPlans" title="HostingPlans" icon="inventory_48.png" />
<Module moduleDefinitionID="HostingAddons" title="HostingAddons" icon="inventory_add_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
</Content>
</Page>
<Page name="HostingAddons" roles="Administrator,Reseller" hidden="True">
<Page name="UserTasks" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
<ModuleData ref="UserMenu"/>
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="HostingAddons" title="HostingAddons" icon="inventory_add_48.png" />
<Module moduleDefinitionID="Tasks" title="Tasks" icon="hourglass_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
</Content>
</Page>
<Page name="UserTasks" roles="Administrator,Reseller,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
<ModuleData ref="UserMenu"/>
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="Tasks" title="Tasks" icon="hourglass_48.png" />
</Content>
</Page>
<Page name="AuditLog" roles="Administrator,Reseller,User" hidden="True">
<Page name="AuditLog" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
<ModuleData ref="UserMenu"/>
@ -133,7 +125,7 @@
</Page>
<!-- Space Home Page -->
<Page name="SpaceHome" roles="Administrator,Reseller,User" hidden="True" skin="Browse3.ascx">
<Page name="SpaceHome" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Browse3.ascx">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -141,18 +133,18 @@
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="SpaceQuotas" title="SpaceQuotas" container="Browse.ascx" icon="stadistics_48.png" />
<Module moduleDefinitionID="SpaceNestedSpacesSummary" title="SpaceNestedSpacesSummary" container="Browse.ascx" roles="Administrator,Reseller" icon="sphere_down_48.png" />
<Module moduleDefinitionID="SpaceNestedSpacesSummary" title="SpaceNestedSpacesSummary" container="Browse.ascx" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" icon="sphere_down_48.png" />
<Module moduleDefinitionID="SpaceNotes" title="SpaceNotes" container="Browse.ascx" roles="Administrator,Reseller" icon="notes_48.png" />
</Content>
<Content id="RightPane">
<Module moduleDefinitionID="SpaceDetails" title="SpaceDetails" container="Clear.ascx" />
<Module moduleDefinitionID="SpaceSettings" title="SpaceSettings" container="Clear.ascx" roles="Administrator,Reseller" />
<Module moduleDefinitionID="SpaceSettings" title="SpaceSettings" container="Clear.ascx" roles="Administrator,Reseller"/>
<Module moduleDefinitionID="SpaceTools" title="SpaceTools" container="Clear.ascx" />
</Content>
</Page>
<!-- Nested Spaces Page -->
<Page name="NestedSpaces" roles="Administrator,Reseller,User" hidden="True">
<Page name="NestedSpaces" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -165,7 +157,7 @@
<Page name="SpaceOrganizationHostedSharePoint" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceOrganizationHostedSharePoint" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="HostedSolutionMenu" title="HostedSolutionMenu" container="Clear.ascx">
<ModuleData ref="HostedSolutionMenu"/>
@ -176,18 +168,18 @@
</Content>
</Page>
<Page name="SpaceDomains" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceDomains" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="Domains" title="Domains" icon="world_48.png" />
<Module moduleDefinitionID="Domains" title="Domains" icon="world_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User"/>
</Content>
</Page>
<Page name="SpaceWeb" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceWeb" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -198,7 +190,7 @@
</Content>
</Page>
<Page name="SpaceWebSites" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceWebSites" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -209,7 +201,7 @@
</Content>
</Page>
<Page name="SpaceWebIPAddresses" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceWebIPAddresses" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -220,7 +212,7 @@
</Content>
</Page>
<Page name="SpaceFtpAccounts" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceFtpAccounts" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -230,8 +222,10 @@
<Module moduleDefinitionID="FtpAccounts" title="FtpAccounts" icon="folder_up_48.png" />
</Content>
</Page>
<Page name="SpaceMail" roles="*" hidden="True"/>
<Page name="SpaceMailAccounts" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceMail" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True"/>
<Page name="SpaceMailAccounts" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -241,7 +235,8 @@
<Module moduleDefinitionID="MailAccounts" title="MailAccounts" icon="accounting_mail_48.png" />
</Content>
</Page>
<Page name="SpaceMailForwardings" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceMailForwardings" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -251,7 +246,8 @@
<Module moduleDefinitionID="MailForwardings" title="MailForwardings" icon="safe-mail_next_48.png" />
</Content>
</Page>
<Page name="SpaceMailGroups" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceMailGroups" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -261,7 +257,8 @@
<Module moduleDefinitionID="MailGroups" title="MailGroups" icon="contacts_mail_48.png" />
</Content>
</Page>
<Page name="SpaceMailLists" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceMailLists" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -271,7 +268,8 @@
<Module moduleDefinitionID="MailLists" title="MailLists" icon="discussion_group_48.png" />
</Content>
</Page>
<Page name="SpaceMailDomains" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceMailDomains" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -281,8 +279,10 @@
<Module moduleDefinitionID="MailDomains" title="MailDomains" icon="web_mail_48.png" />
</Content>
</Page>
<Page name="SpaceDatabases" roles="*" hidden="True"/>
<Page name="SpaceMsSql2000" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceDatabases" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True"/>
<Page name="SpaceMsSql2000" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -301,7 +301,8 @@
</Module>
</Content>
</Page>
<Page name="SpaceMsSql2005" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceMsSql2005" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -321,7 +322,7 @@
</Content>
</Page>
<Page name="SpaceMsSql2008" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceMsSql2008" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -340,8 +341,28 @@
</Module>
</Content>
</Page>
<Page name="SpaceMsSql2012" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="SqlDatabases" title="Sql2012Databases" icon="mssql_48.png">
<Settings>
<Add name="GroupName" value="MsSQL2012" />
</Settings>
</Module>
<Module moduleDefinitionID="SqlUsers" title="Sql2012Users" icon="db_user_48.png">
<Settings>
<Add name="GroupName" value="MsSQL2012" />
</Settings>
</Module>
</Content>
</Page>
<Page name="SpaceMySql4" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceMySql4" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -360,7 +381,8 @@
</Module>
</Content>
</Page>
<Page name="SpaceMySql5" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceMySql5" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -379,7 +401,8 @@
</Module>
</Content>
</Page>
<Page name="SpaceSharedSSL" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceSharedSSL" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -389,7 +412,8 @@
<Module moduleDefinitionID="SharedSSL" title="SharedSSL" icon="world_lock_48.png" />
</Content>
</Page>
<Page name="SpaceAdvancedStatistics" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceAdvancedStatistics" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -399,7 +423,8 @@
<Module moduleDefinitionID="AdvancedStatistics" title="AdvancedStatistics" icon="stadistics_48.png" />
</Content>
</Page>
<Page name="SpaceOdbc" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceOdbc" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -409,7 +434,8 @@
<Module moduleDefinitionID="ODBC" title="ODBC" icon="export_db_back_48.png" />
</Content>
</Page>
<Page name="SpaceScheduledTasks" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceScheduledTasks" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -419,7 +445,8 @@
<Module moduleDefinitionID="ScheduledTasks" title="ScheduledTasks" icon="calendar_month_2_clock_48.png" />
</Content>
</Page>
<Page name="SpaceFileManager" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceFileManager" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -430,7 +457,7 @@
</Content>
</Page>
<Page name="SpaceWebApplicationsGallery" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceWebApplicationsGallery" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -442,8 +469,9 @@
</Page>
<Page name="SpaceSharePoint" roles="Administrator,Reseller,User" hidden="True"/>
<Page name="SpaceSharePointSites" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceSharePoint" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True"/>
<Page name="SpaceSharePointSites" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="HostedSolutionMenu" title="HostedSolutionMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -453,7 +481,8 @@
<Module moduleDefinitionID="SharePointSites" title="SharePointSites" icon="colors_48.png" />
</Content>
</Page>
<Page name="SpaceSharePointUsers" roles="Administrator,Reseller,User" hidden="True">
<Page name="SpaceSharePointUsers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
@ -465,47 +494,47 @@
</Content>
</Page>
<Page name="Backup" roles="Administrator,Reseller,User" hidden="True">
<Page name="Backup" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
<!-- Do not remove this stub page -->
</Page>
<Page name="SpaceExchangeServer" roles="Administrator,Reseller,User" hidden="True" skin="Exchange.ascx" adminskin="Exchange.ascx">
<Page name="SpaceExchangeServer" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Exchange.ascx" adminskin="Exchange.ascx">
<Content id="ContentPane">
<Module moduleDefinitionID="ExchangeServer" title="ExchangeServer" icon="" container="Exchange.ascx" admincontainer="Exchange.ascx"/>
<Module moduleDefinitionID="ExchangeServer" title="ExchangeServer" icon="" container="Exchange.ascx" admincontainer="Exchange.ascx" readOnlyRoles="ResellerCSR"/>
</Content>
</Page>
<Page name="SpaceVPS" roles="Administrator,Reseller,User" hidden="True" skin="VPS.ascx" adminskin="VPS.ascx">
<Page name="SpaceVPS" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="VPS.ascx" adminskin="VPS.ascx">
<Content id="ContentPane">
<Module moduleDefinitionID="VPS" title="VirtualPrivateServers" icon="" container="VPS.ascx" admincontainer="VPS.ascx"/>
</Content>
</Page>
<Page name="SpaceVPSForPC" roles="Administrator,Reseller,User" hidden="True" skin="VPS.ascx" adminskin="VPS.ascx">
<Page name="SpaceVPSForPC" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="VPS.ascx" adminskin="VPS.ascx">
<Content id="ContentPane">
<Module moduleDefinitionID="VPSForPC" title="VirtualPrivateServersForPrivateCloud" icon="" container="VPSForPC.ascx" admincontainer="VPSForPC.ascx"/>
</Content>
</Page>
<Page name="OverusageReport" roles="Administrator,Reseller" hidden="True" skin="Browse1.ascx">
<Page name="OverusageReport" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" hidden="True" skin="Browse1.ascx">
<Content id="ContentPane">
<Module moduleDefinitionID="OverusageReport" title="OverusageReport" container="Edit.ascx" icon="table_zoom_48.png" />
</Content>
</Page>
<Page name="Reporting" roles="Administrator,Reseller,User" enabled="false">
<Page name="Reporting" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" enabled="false">
<Content id="LeftPane">
<Module moduleDefinitionID="User" title="User" container="Clear.ascx" />
<Module moduleDefinitionID="HostingSpace" title="HostingSpace" container="Clear.ascx" />
</Content>
<Pages>
<Page name="DiskspaceReport" roles="Administrator,Reseller,User" skin="Browse1.ascx">
<Page name="DiskspaceReport" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" skin="Browse1.ascx">
<Content id="ContentPane">
<Module moduleDefinitionID="DiskspaceReport" title="DiskspaceReport" container="Edit.ascx" icon="table_zoom_48.png" />
</Content>
</Page>
<Page name="BandwidthReport" roles="Administrator,Reseller,User" skin="Browse1.ascx">
<Page name="BandwidthReport" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" skin="Browse1.ascx">
<Content id="ContentPane">
<Module moduleDefinitionID="BandwidthReport" title="BandwidthReport" container="Edit.ascx" icon="table_zoom_48.png" />
</Content>
@ -537,16 +566,4 @@
</Pages>
</Page>
<Page name="SpaceExchangeHostedEdition" roles="Administrator,Reseller,User" hidden="True">
<Content id="LeftPane">
<Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
<ModuleData ref="SpaceMenu"/>
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="ExchangeHostedEdition" title="ExchangeHostedEdition" icon="enterprise.png">
</Module>
</Content>
</Page>
</Pages>

View file

@ -378,6 +378,9 @@
<data name="ModuleTitle.ManageWindowsServices" xml:space="preserve">
<value>Manage Windows Services</value>
</data>
<data name="ModuleTitle.ManagePlatformInstaller" xml:space="preserve">
<value>Manage Web Platform Installer</value>
</data>
<data name="ModuleTitle.MyDatabases" xml:space="preserve">
<value>My Databases</value>
</data>
@ -522,6 +525,12 @@
<data name="ModuleTitle.Sql2008Users" xml:space="preserve">
<value>SQL Server 2008 Logins</value>
</data>
<data name="ModuleTitle.Sql2012Databases" xml:space="preserve">
<value>SQL Server 2012 Databases</value>
</data>
<data name="ModuleTitle.Sql2012Users" xml:space="preserve">
<value>SQL Server 2012 Logins</value>
</data>
<data name="ModuleTitle.SQLDatabaseProperties" xml:space="preserve">
<value>SQL Database Properties</value>
</data>
@ -729,9 +738,6 @@
<data name="ModuleTitle.WebSitesAllocateIPAddresses" xml:space="preserve">
<value>Allocate Web Site IP Addresses</value>
</data>
<data name="ModuleTitle.ExchangeHostedEdition" xml:space="preserve">
<value>Exchange Hosting Mode</value>
</data>
<data name="ModuleTitle.HostedExchangeAddOrganizationDomain" xml:space="preserve">
<value>Add Organization Domain</value>
</data>

View file

@ -282,6 +282,12 @@
<data name="PageTitle.SpaceMsSql2008" xml:space="preserve">
<value>{user} - {space} - SQL Server 2008</value>
</data>
<data name="PageName.SpaceMsSql2012" xml:space="preserve">
<value>SQL Server 2012</value>
</data>
<data name="PageTitle.SpaceMsSql2012" xml:space="preserve">
<value>{user} - {space} - SQL Server 2012</value>
</data>
<data name="PageTitle.SpaceMsSql2005" xml:space="preserve">
<value>{user} - {space} - SQL Server 2005</value>
</data>
@ -331,7 +337,7 @@
<value>Applications Installer</value>
</data>
<data name="PageName.SpaceWebApplicationsGallery" xml:space="preserve">
<value>Microsoft Web App Gallery</value>
<value>Web App Gallery</value>
</data>
<data name="PageTitle.SpaceApplicationsInstaller" xml:space="preserve">
<value>{user} - {space} - Applications Installer</value>
@ -447,12 +453,6 @@
<data name="PageTitle.SpaceWeb" xml:space="preserve">
<value>{user} - {space} - Web</value>
</data>
<data name="PageName.SpaceExchangeHostedEdition" xml:space="preserve">
<value>Exchange Hosting Mode</value>
</data>
<data name="PageTitle.SpaceExchangeHostedEdition" xml:space="preserve">
<value>{user} - {space} - Exchange Hosting Mode</value>
</data>
<data name="PageName.SpaceVPSForPC" xml:space="preserve">
<value>Virtual Private Cloud</value>
</data>

View file

@ -873,6 +873,9 @@
<data name="Error.SERVER_UPDATE_SERVICE_PROPS" xml:space="preserve">
<value>Error saving server service settings</value>
</data>
<data name="Error.WPI_LOAD_FEED" xml:space="preserve">
<value>Error loading feeds. Please check system settings</value>
</data>
<data name="Error.SPACE_LETTER_GET" xml:space="preserve">
<value>Error building hosting space summary letter</value>
</data>
@ -1809,6 +1812,24 @@
<data name="Quota.MsSQL2008.Users" xml:space="preserve">
<value>Users</value>
</data>
<data name="Quota.MsSQL2012.Backup" xml:space="preserve">
<value>Database Backups</value>
</data>
<data name="Quota.MsSQL2012.Databases" xml:space="preserve">
<value>Databases</value>
</data>
<data name="Quota.MsSQL2012.MaxDatabaseSize" xml:space="preserve">
<value>Max Database Size, MB</value>
</data>
<data name="Quota.MsSQL2012.Restore" xml:space="preserve">
<value>Database Restores</value>
</data>
<data name="Quota.MsSQL2012.Truncate" xml:space="preserve">
<value>Database Truncate</value>
</data>
<data name="Quota.MsSQL2012.Users" xml:space="preserve">
<value>Users</value>
</data>
<data name="Quota.MySQL5.Backup" xml:space="preserve">
<value>Database Backups</value>
</data>
@ -1848,6 +1869,9 @@
<data name="ResourceGroup.MsSQL2008" xml:space="preserve">
<value>SQL Server 2008</value>
</data>
<data name="ResourceGroup.MsSQL2012" xml:space="preserve">
<value>SQL Server 2012</value>
</data>
<data name="ResourceGroup.MySQL5" xml:space="preserve">
<value>MySQL 5</value>
</data>
@ -2040,6 +2064,12 @@
<data name="ServiceItemType.MsSQL2008User" xml:space="preserve">
<value>MS SQL 2008 User</value>
</data>
<data name="ServiceItemType.MsSQL2012Database" xml:space="preserve">
<value>MS SQL 2012 Database</value>
</data>
<data name="ServiceItemType.MsSQL2012User" xml:space="preserve">
<value>MS SQL 2012 User</value>
</data>
<data name="ServiceItemType.MySQL4Database" xml:space="preserve">
<value>MySQL 4 Database</value>
</data>
@ -2670,6 +2700,9 @@
<data name="AuditLogTask.EXCHANGE_DELETE_MAILBOX" xml:space="preserve">
<value>Delete mailbox</value>
</data>
<data name="AuditLogTask.EXCHANGE_DELETE_MAILBOXPLAN" xml:space="preserve">
<value>Delete mailboxplan</value>
</data>
<data name="AuditLogTask.EXCHANGE_DELETE_MAILBOX_ADDRESSES" xml:space="preserve">
<value>Delete mailbox e-mail addresses</value>
</data>
@ -2779,7 +2812,7 @@
<value>Contacts per Organization</value>
</data>
<data name="Quota.Exchange2007.DiskSpace" xml:space="preserve">
<value>Max mailbox size, MB</value>
<value>Mailbox storage, MB</value>
</data>
<data name="Quota.Exchange2007.DistributionLists" xml:space="preserve">
<value>Distribution Lists per Organization</value>
@ -2823,6 +2856,18 @@
<data name="Quota.Exchange2007.PublicFolders" xml:space="preserve">
<value>Public Folders per Organization</value>
</data>
<data name="Quota.Exchange2007.KeepDeletedItemsDays" xml:space="preserve">
<value>Keep Deleted Items (Days)</value>
</data>
<data name="Quota.Exchange2007.MaxRecipients" xml:space="preserve">
<value>Maximum Recipients</value>
</data>
<data name="Quota.Exchange2007.MaxSendMessageSizeKB" xml:space="preserve">
<value>Maximum Send Message Size (Kb)</value>
</data>
<data name="Quota.Exchange2007.MaxReceiveMessageSizeKB" xml:space="preserve">
<value>Maximum Receive Message Size (Kb)</value>
</data>
<data name="ResourceGroup.Exchange" xml:space="preserve">
<value>Hosted Exchange</value>
</data>
@ -2850,6 +2895,9 @@
<data name="Error.EXCHANGE_DELETE_MAILBOX" xml:space="preserve">
<value>Error deleting mailbox. See audit log for more details.</value>
</data>
<data name="Error.EXCHANGE_DELETE_MAILBOXPLAN" xml:space="preserve">
<value>Unable to delete mailboxplan. Make sure the mailbox plan is not assigned to any mailbox</value>
</data>
<data name="Error.EXCHANGE_DELETE_ORG" xml:space="preserve">
<value>Error deleting Exchange organization. See audit log for more details.</value>
</data>
@ -3151,6 +3199,9 @@
<data name="Quota.MsSQL2008.MaxLogSize" xml:space="preserve">
<value>Max Log Size, MB</value>
</data>
<data name="Quota.MsSQL2012.MaxLogSize" xml:space="preserve">
<value>Max Log Size, MB</value>
</data>
<data name="Error.EXCHANGE_UPDATE_MAILBOX_PERMISSIONS" xml:space="preserve">
<value>Error updating mailbox permissions. See audit log for more details.</value>
</data>
@ -4556,7 +4607,7 @@
<value>OCS users quota has been reached.</value>
</data>
<data name="Quota.Web.WebAppGallery" xml:space="preserve">
<value>Microsoft Web App Gallery</value>
<value>Web App Gallery</value>
</data>
<data name="Error.GALLERY_APP_DOWNLOAD_FAILED" xml:space="preserve">
<value>We apologize for the inconvenience but the application download has been failed. Please contact your service provider to correct the issue.</value>
@ -4693,6 +4744,9 @@
<data name="ReportResourceGroup.MsSQL2008" xml:space="preserve">
<value>SQL Server 2008</value>
</data>
<data name="ReportResourceGroup.MsSQL2012" xml:space="preserve">
<value>SQL Server 2012</value>
</data>
<data name="WebAppGallery.ApplicationInstallationError" xml:space="preserve">
<value>Error while install application pack</value>
</data>
@ -4789,138 +4843,12 @@
<data name="Quota.Web.SSL" xml:space="preserve">
<value>SSL</value>
</data>
<data name="Quota.ExchangeHostedEdition.Contacts" xml:space="preserve">
<value>Contacts</value>
</data>
<data name="Quota.ExchangeHostedEdition.DistributionLists" xml:space="preserve">
<value>Distribution Lists</value>
</data>
<data name="Quota.ExchangeHostedEdition.Domains" xml:space="preserve">
<value>Domains</value>
</data>
<data name="Quota.ExchangeHostedEdition.Mailboxes" xml:space="preserve">
<value>Mailboxes</value>
</data>
<data name="ReportResourceGroup.ExchangeHostedEdition" xml:space="preserve">
<value>Exchange 2010 Hosting Mode</value>
</data>
<data name="ResourceGroup.ExchangeHostedEdition" xml:space="preserve">
<value>Exchange Hosting Mode</value>
</data>
<data name="Error.EXCHANGE_HOSTED_CREATE_ORGANIZATION" xml:space="preserve">
<value>Error creating Exchange organization</value>
</data>
<data name="Error.EXCHANGE_HOSTED_DELETE_ORGANIZATION" xml:space="preserve">
<value>Exchange organization cannot be deleted</value>
</data>
<data name="Error.EXCHANGE_HOSTED_SEND_SUMMARY" xml:space="preserve">
<value>Error sending Exchange organization summary information</value>
</data>
<data name="ErrorDescription.EXCHANGE_HOSTED_CREATE_ORGANIZATION" xml:space="preserve">
<value>Please contact your hosting provider.</value>
</data>
<data name="ErrorDescription.EXCHANGE_HOSTED_SEND_SUMMARY" xml:space="preserve">
<value>Please contact your hosting provider.</value>
</data>
<data name="ServiceItemType.ExchangeOrganization" xml:space="preserve">
<value>Exchange Organization</value>
</data>
<data name="Success.EXCHANGE_HOSTED_SEND_SUMMARY" xml:space="preserve">
<value>Exchange organization summary information has been sent</value>
</data>
<data name="Warning.EXCHANGE_HOSTED_CONFIRM_DELETE_ORGANIZATION" xml:space="preserve">
<value>You have to tick a checkbox to confirm organization deletion</value>
</data>
<data name="Error.EXCHANGE_HOSTED_ADD_DOMAIN" xml:space="preserve">
<value>Organization domain cannot be added</value>
</data>
<data name="Error.EXCHANGE_HOSTED_CHANGE_QUOTAS" xml:space="preserve">
<value>Organization quotas cannot be changed</value>
</data>
<data name="Error.EXCHANGE_HOSTED_CHANGE_SERVICE_PLAN" xml:space="preserve">
<value>Organization Service Plan cannot be changed</value>
</data>
<data name="Error.EXCHANGE_HOSTED_GET_DOMAINS" xml:space="preserve">
<value>Error reading Exchange organization domains</value>
</data>
<data name="Error.EXCHANGE_HOSTED_GET_ORGANIZATION" xml:space="preserve">
<value>Organization details cannot be loaded.</value>
</data>
<data name="ErrorDescription.EXCHANGE_HOSTED_ADD_DOMAIN" xml:space="preserve">
<value>Please contact your hosting provider.</value>
</data>
<data name="ErrorDescription.EXCHANGE_HOSTED_CHANGE_QUOTAS" xml:space="preserve">
<value>Please contact your hosting provider.</value>
</data>
<data name="ErrorDescription.EXCHANGE_HOSTED_CHANGE_SERVICE_PLAN" xml:space="preserve">
<value>Please contact your hosting provider.</value>
</data>
<data name="ErrorDescription.EXCHANGE_HOSTED_GET_ORGANIZATION" xml:space="preserve">
<value>Please contact your hosting provider.</value>
</data>
<data name="Error.EXCHANGE_HOSTED_DELETE_DOMAIN" xml:space="preserve">
<value>Organization domain cannot be deleted</value>
</data>
<data name="ExchangeHostedEdition.AddDomainAlreadyUsedError" xml:space="preserve">
<value>Specified domain name already added into organization.</value>
</data>
<data name="ExchangeHostedEdition.AddDomainError" xml:space="preserve">
<value>Error adding organization domain.</value>
</data>
<data name="ExchangeHostedEdition.AddDomainExistsError" xml:space="preserve">
<value>Specified domain name already exists.</value>
</data>
<data name="ExchangeHostedEdition.AddDomainQuotaExceededError" xml:space="preserve">
<value>Maximum domains quota has been reached.</value>
</data>
<data name="ExchangeHostedEdition.CreateOrganizationError" xml:space="preserve">
<value>Error creating organization. See system logs for detailed messages.</value>
</data>
<data name="ExchangeHostedEdition.DeleteDomainError" xml:space="preserve">
<value>Error deleting organization domain.</value>
</data>
<data name="ExchangeHostedEdition.DeleteOrganizationError" xml:space="preserve">
<value>Error deleting organization. See system logs for detailed messages.</value>
</data>
<data name="ExchangeHostedEdition.ExchangeServiceNotEnabledError" xml:space="preserve">
<value>Exchange Hosting Mode service is not enabled for the hosting space.</value>
</data>
<data name="ExchangeHostedEdition.GeneralError" xml:space="preserve">
<value>General module error.</value>
</data>
<data name="ExchangeHostedEdition.OfferIdIsNotSetError" xml:space="preserve">
<value>Offer ID is not specified on Exchange service settings.</value>
</data>
<data name="ExchangeHostedEdition.OrganizationNotFoundError" xml:space="preserve">
<value>Organization not found.</value>
</data>
<data name="ExchangeHostedEdition.ProgramIdIsNotSetError" xml:space="preserve">
<value>Program ID is not specified on Exchange service settings.</value>
</data>
<data name="ExchangeHostedEdition.SendOrganizationSummaryError" xml:space="preserve">
<value>Error sending organization summary information.</value>
</data>
<data name="ExchangeHostedEdition.SendOrganizationTemplateNotSetError" xml:space="preserve">
<value>Organization summary information template is not set.</value>
</data>
<data name="ExchangeHostedEdition.UpdateCatchAllError" xml:space="preserve">
<value>Error updating catch-all account.</value>
</data>
<data name="ExchangeHostedEdition.UpdateQuotasError" xml:space="preserve">
<value>Error updating organization quotas.</value>
</data>
<data name="ExchangeHostedEdition.UpdateQuotasWrongQuotaError" xml:space="preserve">
<value>One of the specified quotas exceed maximum value allowed.</value>
</data>
<data name="ExchangeHostedEdition.UpdateServicePlanError" xml:space="preserve">
<value>Error changing organization service plan. See system logs for detailed messages.</value>
</data>
<data name="Quota.Mail.DisableSizeEdit" xml:space="preserve">
<value>Disable Mailbox Size Edit</value>
</data>
<data name="AuditLogSource.ExchangeHostedEdition" xml:space="preserve">
<value>Exchange Hosting Mode</value>
</data>
<data name="Text.Unlimited" xml:space="preserve">
<value>Unlimited</value>
</data>
@ -5080,4 +5008,160 @@
<data name="Success.WPUB_PROFILE_SAVE" xml:space="preserve">
<value>Web Publishing profile for this web site has been successfully saved</value>
</data>
<data name="Quota.HostedSharePoint.UseSharedSSL" xml:space="preserve">
<value>Use shared SSL Root</value>
</data>
<data name="Quota.Exchange2007.IsConsumer" xml:space="preserve">
<value>Consumer Organization Support</value>
</data>
<data name="Quota.Exchange2007.EnablePlansEditing" xml:space="preserve">
<value>Enable Mailbox Plans Editing</value>
</data>
<data name="Error.LYNC_DELETE_DOMAIN" xml:space="preserve">
<value>Error deleting organization domain name. See audit log for more details.</value>
</data>
<data name="Success.CREATE_LYNC_USER" xml:space="preserve">
<value>Lync successfully enabled for this user</value>
</data>
<data name="Error.CREATE_LYNC_USER" xml:space="preserve">
<value>Cannot enable Lync User. The following errors have been occured:</value>
</data>
<data name="Success.ADD_LYNC_FEDERATIONDOMAIN" xml:space="preserve">
<value>Lync successfully added the federation domain</value>
</data>
<data name="Error.ADD_LYNC_FEDERATIONDOMAIN" xml:space="preserve">
<value>Cannot add federation domain. The following errors have been occured:</value>
</data>
<data name="Success.DELETE_LYNC_USER" xml:space="preserve">
<value>Lync successfully disabled for this user</value>
</data>
<data name="Error.DELETE_LYNC_USER" xml:space="preserve">
<value>Cannot delete Lync User, the following errors have been occured:</value>
</data>
<data name="Success.UPDATE_LYNC_USER" xml:space="preserve">
<value>General Lync User settings have been successfully updated.</value>
</data>
<data name="Error.UPDATE_LYNC_USER" xml:space="preserve">
<value>Error updating general Lync User settings.</value>
</data>
<data name="Lync.CANNOT_ADD_LYNC_USER" xml:space="preserve">
<value>Unable to add Lync user.</value>
</data>
<data name="Lync.CANNOT_ADD_LYNC_USER_TO_DATABASE" xml:space="preserve">
<value>Unable to add Lync User to database.</value>
</data>
<data name="Lync.CANNOT_CHECK_IF_LYNC_USER_EXISTS" xml:space="preserve">
<value>Unable to check quota</value>
</data>
<data name="Lync.CANNOT_DELETE_LYNC_USER" xml:space="preserve">
<value>Unable to delete Lync User.</value>
</data>
<data name="Lync.CANNOT_DELETE_LYNC_USER_FROM_METADATA" xml:space="preserve">
<value>Unable to delete Lync User from metadata.</value>
</data>
<data name="Lync.CANNOT_GET_LYNC_PROXY" xml:space="preserve">
<value>Unable to get Lync proxy.</value>
</data>
<data name="Lync.CANNOT_GET_USER_GENERAL_SETTINGS" xml:space="preserve">
<value>Unable to get user general settings.</value>
</data>
<data name="Lync.CANNOT_SET_DEFAULT_SETTINGS" xml:space="preserve">
<value>Unable to set default settings.</value>
</data>
<data name="Lync.GET_LYNC_USERS" xml:space="preserve">
<value>Unable to get Lync Users.</value>
</data>
<data name="Lync.GET_LYNC_USER_COUNT" xml:space="preserve">
<value>Unable to get Lync Users count.</value>
</data>
<data name="Lync.USER_FIRST_NAME_IS_NOT_SPECIFIED" xml:space="preserve">
<value>User first name is not specified.</value>
</data>
<data name="Lync.USER_IS_ALREADY_LYNC_USER" xml:space="preserve">
<value>Current user account is already enabled for Office Communications Server.</value>
</data>
<data name="Lync.USER_LAST_NAME_IS_NOT_SPECIFIED" xml:space="preserve">
<value>User last name is not specified.</value>
</data>
<data name="Lync.USER_QUOTA_HAS_BEEN_REACHED" xml:space="preserve">
<value>Lync users quota has been reached.</value>
</data>
<data name="Quota.Lync.Federation" xml:space="preserve">
<value>Federation Allowed</value>
</data>
<data name="Quota.Lync.Users" xml:space="preserve">
<value>Lync Users per Organization</value>
</data>
<data name="Quota.Lync.Conferencing" xml:space="preserve">
<value>Conferencing Allowed</value>
</data>
<data name="Quota.Lync.MaxParticipants" xml:space="preserve">
<value>Maximum participants per conference</value>
</data>
<data name="Quota.Lync.AllowVideo" xml:space="preserve">
<value>Conference Video Allowed</value>
</data>
<data name="Quota.Lync.EnterpriseVoice" xml:space="preserve">
<value>Enterprise Voice Allowed</value>
</data>
<data name="Quota.Lync.EVUsers" xml:space="preserve">
<value>Enterprise Voice users</value>
</data>
<data name="Quota.Lync.EVNational" xml:space="preserve">
<value>National Calls Allowed</value>
</data>
<data name="Quota.Lync.EVMobile" xml:space="preserve">
<value>Mobile Calls Allowed</value>
</data>
<data name="Quota.Lync.EVInternational" xml:space="preserve">
<value>International Calls Allowed</value>
</data>
<data name="ResourceGroup.Lync" xml:space="preserve">
<value>Lync Server</value>
</data>
<data name="Success.UPDATE_LYNC_USER" xml:space="preserve">
<value>General Lync User settings have been successfully updated.</value>
</data>
<data name="Warning.CREATE_LYNC_USER" xml:space="preserve">
<value>Lync User has been successfully created but the following errors have been occured:</value>
</data>
<data name="Warning.ADD_LYNC_FEDERATIONDOMAIN" xml:space="preserve">
<value>Lync federation domain has been successfully created but the following errors have been occured:</value>
</data>
<data name="Warning.DELETE_LYNC_USER" xml:space="preserve">
<value>Lync User has been successfully deleted but the following errors have been occured:</value>
</data>
<data name="Error.LYNC_SET_DEFAULT_PLAN" xml:space="preserve">
<value>Error setting default organization lync user plan. See audit log for more details.</value>
</data>
<data name="AuditLogTask.LYNC_ADD_PLAN" xml:space="preserve">
<value>Add organization lync user plan</value>
</data>
<data name="AuditLogTask.LYNC_DELETE_PLAN" xml:space="preserve">
<value>Delete plan</value>
</data>
<data name="Error.LYNC_DELETE_PLAN" xml:space="preserve">
<value>Unable to delete plan. Make sure the plan is not assigned to any user</value>
</data>
<data name="Error.LYNC_ADD_PLAN" xml:space="preserve">
<value>Error creating organization plan. See audit log for more details.</value>
</data>
<data name="Error.ERROR_USER_ACCOUNT_NOT_ENOUGH_PERMISSIONS" xml:space="preserve">
<value>User has not enough permissions to do this task.</value>
</data>
<data name="Error.ERROR_USER_ACCOUNT_ROLE_NOT_ALLOWED" xml:space="preserve">
<value>Wrong user name or password have been specified or account is locked.</value>
</data>
<data name="Error.EXCHANGE_SET_DEFAULT_MAILBOXPLAN" xml:space="preserve">
<value>Failed to set default mailbox plan.</value>
</data>
<data name="Error.EXCHANGE_FAILED_TO_STAMP" xml:space="preserve">
<value>Failed to stamp mailbox with a mailbox plan. See storage allocation.</value>
</data>
<data name="Error.EXCHANGE_SPECIFY_PLAN" xml:space="preserve">
<value>Specify a plan</value>
</data>
<data name="Quota.Lync.EnablePlansEditing" xml:space="preserve">
<value>Enable Lync User Plans Editing</value>
</data>
</root>

View file

@ -66,6 +66,13 @@ Default skin template. The following skins are provided as examples only.
<asp:Image SkinID="CRMLogo" runat="server" ImageUrl="images/crm_48.png" ImageAlign="AbsMiddle"/>
<asp:Image SkinID="OCSLogo" runat="server" ImageUrl="images/ocs48.png" ImageAlign="AbsMiddle"/>
<%-- Lync Icons --%>
<asp:Image SkinID="LyncLogo" runat="server" ImageUrl="images/lync48.png" ImageAlign="AbsMiddle"/>
<asp:Image SkinID="LyncUserPlan48" runat="server" ImageUrl="images/lyncuserplan48.png" ImageAlign="AbsMiddle" Width="48" Height="48"></asp:Image>
<asp:Image SkinID="LyncUserPlanAdd48" runat="server" ImageUrl="images/lyncuserplanadd48.png" ImageAlign="AbsMiddle" Width="48" Height="48"></asp:Image>
<asp:Image SkinID="LyncUser" runat="server" ImageUrl="images/lyncuser.png" ImageAlign="AbsMiddle" Width="48" Height="48"/>
<asp:Image SkinID="LyncFederationDomains48" runat="server" ImageUrl="images/LyncFederationDomains48.png" ImageAlign="AbsMiddle" Width="48" Height="48"></asp:Image>
<%-- BlackBerry Icons --%>
<asp:Image SkinID="BlackBerryUsersLogo" runat="server" ImageUrl="images/bbuser48.png" ImageAlign="AbsMiddle"/>
<%-- VPS Icons --%>

Binary file not shown.

After

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 602 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 602 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
@ -44,6 +44,7 @@ namespace WebsitePanel.WebPortal
private string adminContainerSrc;
private List<string> viewRoles = new List<string>();
private List<string> editRoles = new List<string>();
private List<string> readOnlyRoles = new List<string>();
private Hashtable settings = new Hashtable();
private XmlDocument xmlModuleData = new XmlDocument();
private PortalPage page;
@ -82,6 +83,12 @@ namespace WebsitePanel.WebPortal
get { return this.editRoles; }
}
public List<string> ReadOnlyRoles
{
get { return this.readOnlyRoles; }
}
public Hashtable Settings
{
get { return this.settings; }

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
@ -290,6 +290,9 @@ namespace WebsitePanel.WebPortal
else
page.Roles.AddRange(xmlPage.Attributes["roles"].Value.Split(ROLES_DELIMITERS.ToCharArray()));
if (xmlPage.Attributes["selectedUserContext"] != null)
page.Roles.AddRange(xmlPage.Attributes["selectedUserContext"].Value.Split(ROLES_DELIMITERS.ToCharArray()));
page.Enabled = (xmlPage.Attributes["enabled"] != null) ? Boolean.Parse(xmlPage.Attributes["enabled"].Value) : true;
page.Hidden = (xmlPage.Attributes["hidden"] != null) ? Boolean.Parse(xmlPage.Attributes["hidden"].Value) : false;
page.SkinSrc = (xmlPage.Attributes["skin"] != null) ? xmlPage.Attributes["skin"].Value : null;
@ -343,6 +346,10 @@ namespace WebsitePanel.WebPortal
else
module.ViewRoles.AddRange(xmlModule.Attributes["viewRoles"].Value.Split(ROLES_DELIMITERS.ToCharArray()));
if (xmlModule.Attributes["readOnlyRoles"] != null)
module.ReadOnlyRoles.AddRange(xmlModule.Attributes["readOnlyRoles"].Value.Split(ROLES_DELIMITERS.ToCharArray()));
if (xmlModule.Attributes["editRoles"] == null)
module.EditRoles.Add("*");
else

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
@ -217,6 +217,23 @@ namespace WebsitePanel.Portal
public static void UserSignOut()
{
FormsAuthentication.SignOut();
if (HttpContext.Current.Session != null)
{
HttpContext.Current.Session.Clear();
HttpContext.Current.Session.Abandon();
}
// Clear authentication cookie
HttpCookie rFormsCookie = new HttpCookie(FormsAuthentication.FormsCookieName, "");
rFormsCookie.Expires = DateTime.Now.AddYears(-1);
HttpContext.Current.Response.Cookies.Add(rFormsCookie);
// Clear session cookie
HttpCookie rSessionCookie = new HttpCookie("ASP.NET_SessionId", "");
rSessionCookie.Expires = DateTime.Now.AddYears(-1);
HttpContext.Current.Response.Cookies.Add(rSessionCookie);
HttpContext.Current.Response.Redirect(LoginRedirectUrl);
}
@ -268,6 +285,7 @@ namespace WebsitePanel.Portal
authCookie.Secure = FormsAuthentication.RequireSSL;
authCookie.Path = FormsAuthentication.FormsCookiePath;
authCookie.Value = FormsAuthentication.Encrypt(ticket);
authCookie.HttpOnly = true;
if (persistent)
authCookie.Expires = DateTime.Now.AddMonths(1);
@ -330,11 +348,15 @@ namespace WebsitePanel.Portal
UserInfo user = authService.GetUserByUsernamePassword(username, password, ipAddress);
if (user != null)
{
// issue authentication ticket
FormsAuthenticationTicket ticket = CreateAuthTicket(user.Username, user.Password, user.Role, rememberLogin);
SetAuthTicket(ticket, rememberLogin);
if (IsRoleAllowedToLogin(user.Role))
{
// issue authentication ticket
FormsAuthenticationTicket ticket = CreateAuthTicket(user.Username, user.Password, user.Role, rememberLogin);
SetAuthTicket(ticket, rememberLogin);
CompleteUserLogin(username, rememberLogin, preferredLocale, theme);
CompleteUserLogin(username, rememberLogin, preferredLocale, theme);
}
else return BusinessErrorCodes.ERROR_USER_ACCOUNT_ROLE_NOT_ALLOWED;
}
return 0;
@ -346,6 +368,25 @@ namespace WebsitePanel.Portal
}
}
private static bool IsRoleAllowedToLogin(UserRole role)
{
string tmp = GetExcludedRolesToLogin();
if (tmp == null) tmp = string.Empty;
string roleKey = ((UserRole)role).ToString();
return !tmp.Contains(roleKey);
}
public static string GetExcludedRolesToLogin()
{
return PortalConfiguration.SiteSettings["ExcludedRolesToLogin"];
}
private static int GetAuthenticationFormsTimeout()
{
//default
@ -500,6 +541,8 @@ namespace WebsitePanel.Portal
// store last successful username in the cookie
HttpCookie cookie = new HttpCookie("WebsitePanelLogin", username);
cookie.Expires = DateTime.Now.AddDays(7);
cookie.Secure = FormsAuthentication.RequireSSL;
cookie.HttpOnly = true;
HttpContext.Current.Response.Cookies.Add(cookie);
// set language

View file

@ -0,0 +1,184 @@
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// - Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
//
// - Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// - Neither the name of the Outercurve Foundation nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using System;
using System.Web;
using System.Web.Security;
using System.Web.Caching;
using System.Configuration;
using System.Security.Cryptography;
using System.Runtime.Serialization;
using System.Globalization;
using System.Text;
using Microsoft.Security.Application;
namespace WebsitePanel.WebPortal
{
public class SecureSessionModule : IHttpModule
{
public const string DEFAULT_PAGE = "~/Default.aspx";
public const string PAGE_ID_PARAM = "pid";
private static string _ValidationKey = null;
public void Init(HttpApplication app)
{
// Initialize validation key if not already initialized
if (_ValidationKey == null)
_ValidationKey = GetValidationKey();
// Register handlers for BeginRequest and EndRequest events
app.BeginRequest += new EventHandler(OnBeginRequest);
app.EndRequest += new EventHandler(OnEndRequest);
}
public void Dispose() { }
void OnBeginRequest(Object sender, EventArgs e)
{
// Look for an incoming cookie named "ASP.NET_SessionID"
HttpRequest request = ((HttpApplication)sender).Request;
HttpCookie cookie = GetCookie(request, "ASP.NET_SessionId");
HttpCookie authCookie = request.Cookies[FormsAuthentication.FormsCookieName];
if (cookie != null)
{
// Throw an exception if the cookie lacks a MAC
if (cookie.Value.Length <= 24)
{
if ((authCookie != null))
{
WebsitePanel.Portal.PortalUtils.UserSignOut();
}
return;
}
// Separate the session ID and the MAC
string id = cookie.Value.Substring(0, 24);
string mac1 = cookie.Value.Substring(24);
// Generate a new MAC from the session ID and requestor info
string mac2 = GetSessionIDMac(id, request.UserHostAddress,
request.UserAgent, _ValidationKey);
// Throw an exception if the MACs don't match
if (String.CompareOrdinal(mac1, mac2) != 0)
{
WebsitePanel.Portal.PortalUtils.UserSignOut();
}
// Strip the MAC from the cookie before ASP.NET sees it
cookie.Value = id;
}
}
void OnEndRequest(Object sender, EventArgs e)
{
// Look for an outgoing cookie named "ASP.NET_SessionID"
HttpRequest request = ((HttpApplication)sender).Request;
HttpCookie cookie = GetCookie( request, "ASP.NET_SessionId");
if (cookie != null)
{
// Add a MAC
cookie.Value += GetSessionIDMac(cookie.Value,
request.UserHostAddress, request.UserAgent,
_ValidationKey);
}
}
private string GetValidationKey()
{
string key = ConfigurationManager.AppSettings["SessionValidationKey"];
if (key == null || key == String.Empty)
throw new InvalidSessionException
("SessionValidationKey missing");
return key;
}
private HttpCookie GetCookie(HttpRequest request, string name)
{
HttpCookieCollection cookies = request.Cookies;
return FindCookie(cookies, name);
}
private HttpCookie GetCookie(HttpResponse response, string name)
{
HttpCookieCollection cookies = response.Cookies;
return FindCookie(cookies, name);
}
private HttpCookie FindCookie(HttpCookieCollection cookies,
string name)
{
int count = cookies.Count;
for (int i = 0; i < count; i++)
{
if (String.Compare(cookies[i].Name, name, true,
CultureInfo.InvariantCulture) == 0)
return cookies[i];
}
return null;
}
private string GetSessionIDMac(string id, string ip,
string agent, string key)
{
StringBuilder builder = new StringBuilder(id, 512);
builder.Append(ip);
builder.Append(agent);
using (HMACSHA1 hmac = new HMACSHA1
(Encoding.UTF8.GetBytes(key)))
{
return Convert.ToBase64String(hmac.ComputeHash
(Encoding.UTF8.GetBytes(builder.ToString())));
}
}
}
[Serializable]
public class InvalidSessionException : Exception
{
public InvalidSessionException() :
base("Session cookie is invalid") { }
public InvalidSessionException(string message) :
base(message) { }
public InvalidSessionException(string message,
Exception inner)
: base(message, inner) { }
protected InvalidSessionException(SerializationInfo info,
StreamingContext context)
: base(info, context) { }
}
}

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -13,7 +13,7 @@
<![endif]-->
</head>
<body>
<form id="form1" runat="server">
<form id="form1" runat="server" autocomplete="off">
<asp:PlaceHolder ID="skinPlaceHolder" runat="server"></asp:PlaceHolder>
</form>
</body>

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,

Some files were not shown because too many files have changed in this diff Show more