Skip to content

Commit 2ac8cf1

Browse files
committed
v6.1.4279
1 parent 48f0f3c commit 2ac8cf1

File tree

89 files changed

+645
-555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+645
-555
lines changed

CS/CalDAVServer.FileSystemStorage.AspNet/CalDAVServer.FileSystemStorage.AspNet.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProductVersion>9.0.30729</ProductVersion>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<ProjectGuid>1E9BD158-62F0-43F5-80F8-061AAFAD07BB</ProjectGuid>
9+
<ProjectGuid>D219E4C5-4DD9-45D5-B766-CBE6D8819F73</ProjectGuid>
1010
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1111
<OutputType>Library</OutputType>
1212
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -123,10 +123,10 @@
123123
</ItemGroup>
124124
<ItemGroup>
125125
<Reference Include="ITHit.WebDAV.Server">
126-
<HintPath>..\packages\ITHit.WebDAV.Server.6.1.4235\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
126+
<HintPath>..\packages\ITHit.WebDAV.Server.6.1.4279\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
127127
</Reference>
128128
<Reference Include="ITHit.WebDAV.Server.Web">
129-
<HintPath>..\packages\ITHit.WebDAV.Server.Web.6.1.4235\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
129+
<HintPath>..\packages\ITHit.WebDAV.Server.Web.6.1.4279\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
130130
</Reference>
131131
</ItemGroup>
132132
<PropertyGroup>
@@ -144,7 +144,7 @@
144144
<AutoAssignPort>True</AutoAssignPort>
145145
<DevelopmentServerPort>9658</DevelopmentServerPort>
146146
<DevelopmentServerVPath>/</DevelopmentServerVPath>
147-
<IISUrl>http://localhost:33538/</IISUrl>
147+
<IISUrl>http://localhost:28113/</IISUrl>
148148
<NTLMAuthentication>True</NTLMAuthentication>
149149
<UseCustomServer>False</UseCustomServer>
150150
<CustomServerUrl>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ITHit.WebDAV.Server" version="6.1.4235" targetFramework="net451" />
4-
<package id="ITHit.WebDAV.Server.Web" version="6.1.4235" targetFramework="net451" />
3+
<package id="ITHit.WebDAV.Server" version="6.1.4279" targetFramework="net451" />
4+
<package id="ITHit.WebDAV.Server.Web" version="6.1.4279" targetFramework="net451" />
55
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net451" />
66
</packages>

CS/CalDAVServer.FileSystemStorage.AspNet/wwwroot/js/webdav-gridview.js

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
' ' +
3535
(oDate.getHours() > 12 ? 'PM' : 'AM');
3636
},
37-
37+
3838

3939
/**
4040
*
@@ -154,7 +154,7 @@
154154
**/
155155
_RenderActions: function (oItem) {
156156
var actions = [];
157-
var isDavProtocoSupported = ITHit.WebDAV.Client.DocManager.IsDavProtocoSupported();
157+
var isDavProtocolSupported = ITHit.WebDAV.Client.DocManager.IsDavProtocolSupported();
158158
var isMicrosoftOfficeDocument = ITHit.WebDAV.Client.DocManager.IsMicrosoftOfficeDocument(oItem.Href);
159159

160160
if (oItem.IsFolder()) {
@@ -163,20 +163,20 @@
163163
attr('title', 'Open this folder in Operating System file manager.').
164164
on('click', function () {
165165
oWebDAV.OpenFolderInOsFileManager(oItem.Href);
166-
}).prop("disabled", !isDavProtocoSupported));
166+
}).prop("disabled", !isDavProtocolSupported));
167167
} else {
168168
actions.push($('<button class="btn btn-transparent"/>').
169169
html('<span class="glyphicon glyphicon-edit"></span> <span class="hidden-xs">Edit</span>').
170170
attr('title', 'Edit document in associated application.').
171171
on('click', function () {
172172
oWebDAV.EditDoc(oItem.Href);
173-
}).prop("disabled", !isDavProtocoSupported && !isMicrosoftOfficeDocument));
173+
}).prop("disabled", !isDavProtocolSupported && !isMicrosoftOfficeDocument));
174174
actions.push($('<button class="btn btn-transparent"/>')
175175
.html('<span class="glyphicon glyphicon-modal-window"></span>')
176176
.attr('title', 'Select application to open this file with.')
177177
.on('click', function () {
178178
oWebDAV.OpenDocWith(oItem.Href);
179-
}).prop("disabled", !isDavProtocoSupported));
179+
}).prop("disabled", !isDavProtocolSupported));
180180
}
181181

182182
actions.push($('<button class="btn btn-transparent"/>')
@@ -415,7 +415,7 @@
415415
}
416416
return false;
417417
});
418-
}
418+
}
419419

420420
var WebDAVController = function () {
421421
this.CurrentFolder = null;
@@ -496,15 +496,17 @@
496496
* @param {string} sDocumentUrl Must be full path including domain name: https://webdavserver.com/path/file.ext
497497
*/
498498
EditDoc: function (sDocumentUrl) {
499-
ITHit.WebDAV.Client.DocManager.EditDocument(sDocumentUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this));
499+
ITHit.WebDAV.Client.DocManager.DavProtocolEditDocument(sDocumentUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this), null, webDavSettings.EditDocAuth.SearchIn,
500+
webDavSettings.EditDocAuth.CookieNames, webDavSettings.EditDocAuth.LoginUrl);
500501
},
501502

502503
/**
503504
* Opens document with.
504505
* @param {string} sDocumentUrl Must be full path including domain name: https://webdavserver.com/path/file.ext
505506
*/
506507
OpenDocWith: function (sDocumentUrl) {
507-
ITHit.WebDAV.Client.DocManager.DavProtocolEditDocument(sDocumentUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this), null, null, null, null, 'OpenWith');
508+
ITHit.WebDAV.Client.DocManager.DavProtocolEditDocument(sDocumentUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this), null, webDavSettings.EditDocAuth.SearchIn,
509+
webDavSettings.EditDocAuth.CookieNames, webDavSettings.EditDocAuth.LoginUrl, 'OpenWith');
508510
},
509511

510512
/**
@@ -529,7 +531,8 @@
529531
* @param {string} sFolderUrl Must be full path including domain name: https://webdavserver.com/path/
530532
*/
531533
OpenFolderInOsFileManager: function (sFolderUrl) {
532-
ITHit.WebDAV.Client.DocManager.OpenFolderInOsFileManager(sFolderUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this));
534+
ITHit.WebDAV.Client.DocManager.OpenFolderInOsFileManager(sFolderUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this), null, webDavSettings.EditDocAuth.SearchIn,
535+
webDavSettings.EditDocAuth.CookieNames, webDavSettings.EditDocAuth.LoginUrl);
533536
},
534537

535538
/**
@@ -556,14 +559,13 @@
556559
* @private
557560
*/
558561
_ProtocolInstallMessage: function () {
559-
if (ITHit.WebDAV.Client.DocManager.IsDavProtocoSupported()) {
562+
if (ITHit.WebDAV.Client.DocManager.IsDavProtocolSupported()) {
560563
oConfirmModal.Confirm('This action requires a protocol installation. Select OK to download the protocol installer.', function () {
561564
// IT Hit WebDAV Ajax Library protocol installers path.
562565
// Used to open non-MS Office documents or if MS Office is
563-
// not installed as well as to open OS File Manager.
564-
var installersFolderPath = webDavSettings.ApplicationPath + '/wwwroot/node_modules/webdav.client/Plugins/';
566+
// not installed as well as to open OS File Manager.
565567

566-
var installerFilePath = installersFolderPath + ITHit.WebDAV.Client.DocManager.GetInstallFileName();
568+
var installerFilePath = webDavSettings.ApplicationProtocolsPath + ITHit.WebDAV.Client.DocManager.GetInstallFileName();
567569
window.open(installerFilePath);
568570
});
569571
}
@@ -575,14 +577,14 @@
575577
var oSearchForm = new SearchFormView('.ithit-search-container');
576578
var oBreadcrumbs = new BreadcrumbsView('.ithit-breadcrumb-container');
577579
var oHistoryApi = new HistoryApiController('.ithit-grid-container, .ithit-breadcrumb-container');
578-
var oWebDAV = window.WebDAVController = new WebDAVController();
580+
var oWebDAV = window.WebDAVController = new WebDAVController();
579581
var oConfirmModal = new ConfirmModal('#ConfirmModal');
580582
var oCreateFolderModal = new CreateFolderModal('#CreateFolderModal', '.btn-create-folder');
581583
// List files on a WebDAV server using WebDAV Ajax Library
582584
oWebDAV.NavigateFolder(location.href);
583585

584586
// Set Ajax lib version
585-
$('.ithit-version-value').text(ITHit.WebDAV.Client.WebDavSession.Version);
587+
$('.ithit-version-value').text('v' + ITHit.WebDAV.Client.WebDavSession.Version + ' (Protocol v' + ITHit.WebDAV.Client.WebDavSession.ProtocolVersion + ')');
586588
$('.ithit-current-folder-value').text(oWebDAV.GetMountUrl());
587589

588590
})();
0 Bytes
Binary file not shown.
Binary file not shown.

CS/CalDAVServer.SqlStorage.AspNet/CalDAVServer.SqlStorage.AspNet.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProductVersion>9.0.30729</ProductVersion>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<ProjectGuid>FF3614E6-B2FB-4260-9F83-5544C9DD3375</ProjectGuid>
9+
<ProjectGuid>2BA27364-9754-4724-8052-1E4593784764</ProjectGuid>
1010
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1111
<OutputType>Library</OutputType>
1212
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -111,10 +111,10 @@
111111
</ItemGroup>
112112
<ItemGroup>
113113
<Reference Include="ITHit.WebDAV.Server">
114-
<HintPath>..\packages\ITHit.WebDAV.Server.6.1.4235\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
114+
<HintPath>..\packages\ITHit.WebDAV.Server.6.1.4279\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
115115
</Reference>
116116
<Reference Include="ITHit.WebDAV.Server.Web">
117-
<HintPath>..\packages\ITHit.WebDAV.Server.Web.6.1.4235\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
117+
<HintPath>..\packages\ITHit.WebDAV.Server.Web.6.1.4279\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
118118
</Reference>
119119
</ItemGroup>
120120
<PropertyGroup>
@@ -132,7 +132,7 @@
132132
<AutoAssignPort>True</AutoAssignPort>
133133
<DevelopmentServerPort>9658</DevelopmentServerPort>
134134
<DevelopmentServerVPath>/</DevelopmentServerVPath>
135-
<IISUrl>http://localhost:31856/</IISUrl>
135+
<IISUrl>http://localhost:41179/</IISUrl>
136136
<NTLMAuthentication>False</NTLMAuthentication>
137137
<UseCustomServer>False</UseCustomServer>
138138
<CustomServerUrl>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ITHit.WebDAV.Server" version="6.1.4235" targetFramework="net451" />
4-
<package id="ITHit.WebDAV.Server.Web" version="6.1.4235" targetFramework="net451" />
3+
<package id="ITHit.WebDAV.Server" version="6.1.4279" targetFramework="net451" />
4+
<package id="ITHit.WebDAV.Server.Web" version="6.1.4279" targetFramework="net451" />
55
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net451" />
66
</packages>

CS/CalDAVServer.SqlStorage.AspNet/wwwroot/js/webdav-gridview.js

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
' ' +
3535
(oDate.getHours() > 12 ? 'PM' : 'AM');
3636
},
37-
37+
3838

3939
/**
4040
*
@@ -154,7 +154,7 @@
154154
**/
155155
_RenderActions: function (oItem) {
156156
var actions = [];
157-
var isDavProtocoSupported = ITHit.WebDAV.Client.DocManager.IsDavProtocoSupported();
157+
var isDavProtocolSupported = ITHit.WebDAV.Client.DocManager.IsDavProtocolSupported();
158158
var isMicrosoftOfficeDocument = ITHit.WebDAV.Client.DocManager.IsMicrosoftOfficeDocument(oItem.Href);
159159

160160
if (oItem.IsFolder()) {
@@ -163,20 +163,20 @@
163163
attr('title', 'Open this folder in Operating System file manager.').
164164
on('click', function () {
165165
oWebDAV.OpenFolderInOsFileManager(oItem.Href);
166-
}).prop("disabled", !isDavProtocoSupported));
166+
}).prop("disabled", !isDavProtocolSupported));
167167
} else {
168168
actions.push($('<button class="btn btn-transparent"/>').
169169
html('<span class="glyphicon glyphicon-edit"></span> <span class="hidden-xs">Edit</span>').
170170
attr('title', 'Edit document in associated application.').
171171
on('click', function () {
172172
oWebDAV.EditDoc(oItem.Href);
173-
}).prop("disabled", !isDavProtocoSupported && !isMicrosoftOfficeDocument));
173+
}).prop("disabled", !isDavProtocolSupported && !isMicrosoftOfficeDocument));
174174
actions.push($('<button class="btn btn-transparent"/>')
175175
.html('<span class="glyphicon glyphicon-modal-window"></span>')
176176
.attr('title', 'Select application to open this file with.')
177177
.on('click', function () {
178178
oWebDAV.OpenDocWith(oItem.Href);
179-
}).prop("disabled", !isDavProtocoSupported));
179+
}).prop("disabled", !isDavProtocolSupported));
180180
}
181181

182182
actions.push($('<button class="btn btn-transparent"/>')
@@ -415,7 +415,7 @@
415415
}
416416
return false;
417417
});
418-
}
418+
}
419419

420420
var WebDAVController = function () {
421421
this.CurrentFolder = null;
@@ -496,15 +496,17 @@
496496
* @param {string} sDocumentUrl Must be full path including domain name: https://webdavserver.com/path/file.ext
497497
*/
498498
EditDoc: function (sDocumentUrl) {
499-
ITHit.WebDAV.Client.DocManager.EditDocument(sDocumentUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this));
499+
ITHit.WebDAV.Client.DocManager.DavProtocolEditDocument(sDocumentUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this), null, webDavSettings.EditDocAuth.SearchIn,
500+
webDavSettings.EditDocAuth.CookieNames, webDavSettings.EditDocAuth.LoginUrl);
500501
},
501502

502503
/**
503504
* Opens document with.
504505
* @param {string} sDocumentUrl Must be full path including domain name: https://webdavserver.com/path/file.ext
505506
*/
506507
OpenDocWith: function (sDocumentUrl) {
507-
ITHit.WebDAV.Client.DocManager.DavProtocolEditDocument(sDocumentUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this), null, null, null, null, 'OpenWith');
508+
ITHit.WebDAV.Client.DocManager.DavProtocolEditDocument(sDocumentUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this), null, webDavSettings.EditDocAuth.SearchIn,
509+
webDavSettings.EditDocAuth.CookieNames, webDavSettings.EditDocAuth.LoginUrl, 'OpenWith');
508510
},
509511

510512
/**
@@ -529,7 +531,8 @@
529531
* @param {string} sFolderUrl Must be full path including domain name: https://webdavserver.com/path/
530532
*/
531533
OpenFolderInOsFileManager: function (sFolderUrl) {
532-
ITHit.WebDAV.Client.DocManager.OpenFolderInOsFileManager(sFolderUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this));
534+
ITHit.WebDAV.Client.DocManager.OpenFolderInOsFileManager(sFolderUrl, this.GetMountUrl(), this._ProtocolInstallMessage.bind(this), null, webDavSettings.EditDocAuth.SearchIn,
535+
webDavSettings.EditDocAuth.CookieNames, webDavSettings.EditDocAuth.LoginUrl);
533536
},
534537

535538
/**
@@ -556,14 +559,13 @@
556559
* @private
557560
*/
558561
_ProtocolInstallMessage: function () {
559-
if (ITHit.WebDAV.Client.DocManager.IsDavProtocoSupported()) {
562+
if (ITHit.WebDAV.Client.DocManager.IsDavProtocolSupported()) {
560563
oConfirmModal.Confirm('This action requires a protocol installation. Select OK to download the protocol installer.', function () {
561564
// IT Hit WebDAV Ajax Library protocol installers path.
562565
// Used to open non-MS Office documents or if MS Office is
563-
// not installed as well as to open OS File Manager.
564-
var installersFolderPath = webDavSettings.ApplicationPath + '/wwwroot/node_modules/webdav.client/Plugins/';
566+
// not installed as well as to open OS File Manager.
565567

566-
var installerFilePath = installersFolderPath + ITHit.WebDAV.Client.DocManager.GetInstallFileName();
568+
var installerFilePath = webDavSettings.ApplicationProtocolsPath + ITHit.WebDAV.Client.DocManager.GetInstallFileName();
567569
window.open(installerFilePath);
568570
});
569571
}
@@ -575,14 +577,14 @@
575577
var oSearchForm = new SearchFormView('.ithit-search-container');
576578
var oBreadcrumbs = new BreadcrumbsView('.ithit-breadcrumb-container');
577579
var oHistoryApi = new HistoryApiController('.ithit-grid-container, .ithit-breadcrumb-container');
578-
var oWebDAV = window.WebDAVController = new WebDAVController();
580+
var oWebDAV = window.WebDAVController = new WebDAVController();
579581
var oConfirmModal = new ConfirmModal('#ConfirmModal');
580582
var oCreateFolderModal = new CreateFolderModal('#CreateFolderModal', '.btn-create-folder');
581583
// List files on a WebDAV server using WebDAV Ajax Library
582584
oWebDAV.NavigateFolder(location.href);
583585

584586
// Set Ajax lib version
585-
$('.ithit-version-value').text(ITHit.WebDAV.Client.WebDavSession.Version);
587+
$('.ithit-version-value').text('v' + ITHit.WebDAV.Client.WebDavSession.Version + ' (Protocol v' + ITHit.WebDAV.Client.WebDavSession.ProtocolVersion + ')');
586588
$('.ithit-current-folder-value').text(oWebDAV.GetMountUrl());
587589

588590
})();

CS/CardDAVServer.FileSystemStorage.AspNet/CardDAVServer.FileSystemStorage.AspNet.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProductVersion>9.0.30729</ProductVersion>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<ProjectGuid>DC7C0541-6EFE-425C-8F04-32235B5D94D0</ProjectGuid>
9+
<ProjectGuid>8DD465C0-6AC4-4D49-ADFA-08C5FC3671FC</ProjectGuid>
1010
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1111
<OutputType>Library</OutputType>
1212
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -120,10 +120,10 @@
120120
</ItemGroup>
121121
<ItemGroup>
122122
<Reference Include="ITHit.WebDAV.Server">
123-
<HintPath>..\packages\ITHit.WebDAV.Server.6.1.4235\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
123+
<HintPath>..\packages\ITHit.WebDAV.Server.6.1.4279\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
124124
</Reference>
125125
<Reference Include="ITHit.WebDAV.Server.Web">
126-
<HintPath>..\packages\ITHit.WebDAV.Server.Web.6.1.4235\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
126+
<HintPath>..\packages\ITHit.WebDAV.Server.Web.6.1.4279\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
127127
</Reference>
128128
</ItemGroup>
129129
<PropertyGroup>
@@ -141,7 +141,7 @@
141141
<AutoAssignPort>True</AutoAssignPort>
142142
<DevelopmentServerPort>9658</DevelopmentServerPort>
143143
<DevelopmentServerVPath>/</DevelopmentServerVPath>
144-
<IISUrl>http://localhost:38943/</IISUrl>
144+
<IISUrl>http://localhost:13056/</IISUrl>
145145
<NTLMAuthentication>True</NTLMAuthentication>
146146
<UseCustomServer>False</UseCustomServer>
147147
<CustomServerUrl>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ITHit.WebDAV.Server" version="6.1.4235" targetFramework="net451" />
4-
<package id="ITHit.WebDAV.Server.Web" version="6.1.4235" targetFramework="net451" />
3+
<package id="ITHit.WebDAV.Server" version="6.1.4279" targetFramework="net451" />
4+
<package id="ITHit.WebDAV.Server.Web" version="6.1.4279" targetFramework="net451" />
55
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net451" />
66
</packages>

0 commit comments

Comments
 (0)