Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for remoteFolder:serverName and for 'ftp' vs 'smb' in remoteFolder:type #5

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for remoteFolder:serverName and for 'ftp' vs 'smb' in remoteFolder:type #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions Module/RicohAddressBook.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,8 @@ function Format-PropertyList {
if ($properties.ContainsKey('remoteFolder:select') -and 'private' -eq $properties['remoteFolder:select']) {
$output.FolderScanAccount = $properties['remoteFolder:accountName']
}

$output.FolderServerName = $properties['remoteFolder:serverName']
}

if (Test-Property $properties 'mail:') {
Expand Down Expand Up @@ -720,9 +722,15 @@ function Get-TagIdValue {
.Parameter UserCode
The User Code property used for authentication management.

.Parameter FolderScanType
The protocol used for scanned file transfer. Either smb or ftp.

.Parameter FolderScanPath
The network path used to save scanned files.

.Parameter FolderServerName
The server IP or DNS name for FTP scans.

.Parameter FolderScanAccount
The account to use to save the scanned files to a network location.

Expand Down Expand Up @@ -868,11 +876,22 @@ function Update-AddressBookEntry {
[Parameter(ValueFromPipelineByPropertyName)]
$UserCode,

[string]
[ValidateSet('smb', 'ftp')]
[Parameter(ValueFromPipelineByPropertyName)]
[PSDefaultValue(Help = "SMB", Value = "smb")]
$FolderScanType,

[string]
[ValidateLength(1, 256)]
[Parameter(ValueFromPipelineByPropertyName)]
$FolderScanPath,

[string]
[ValidateLength(1, 256)]
[Parameter(ValueFromPipelineByPropertyName)]
$FolderServerName,

[pscredential]
[Parameter(ValueFromPipelineByPropertyName)]
$FolderScanAccount,
Expand Down Expand Up @@ -977,9 +996,10 @@ function Update-AddressBookEntry {

if (-not [string]::IsNullOrEmpty($FolderScanPath)) {
add 'remoteFolder:' 'true'
add 'remoteFolder:type' 'smb'
add 'remoteFolder:type' $FolderScanType
add 'remoteFolder:path' $FolderScanPath
add 'remoteFolder:port' 21
add 'remoteFolder:serverName' $FolderServerName
} elseif ($ForceFolderScanPath) {
add 'remoteFolder:' 'false'
}
Expand Down Expand Up @@ -1093,9 +1113,15 @@ function Update-AddressBookEntry {
.Parameter UserCode
The User Code property used for authentication management.

.Parameter FolderScanType
The protocol used for scanned file transfer. Either smb or ftp.

.Parameter FolderScanPath
The network path used to save scanned files.

.Parameter FolderServerName
The server IP or DNS name for FTP scans.

.Parameter FolderScanAccount
The account to use to save the scanned files to a network location.

Expand Down Expand Up @@ -1226,12 +1252,24 @@ function Add-AddressBookEntry {
[Parameter(ValueFromPipelineByPropertyName)]
$UserCode,

[string]
[ValidateSet('smb', 'ftp')]
[Parameter(ValueFromPipelineByPropertyName)]
[PSDefaultValue(Help = "SMB", Value = "smb")]
$FolderScanType,

[string]
[ValidateLength(1, 256)]
[Parameter(ParameterSetName = 'Folder', Mandatory, ValueFromPipelineByPropertyName)]
[Parameter(ParameterSetName = 'FolderAndEmail', Mandatory, ValueFromPipelineByPropertyName)]
$FolderScanPath,

[string]
[ValidateLength(1, 256)]
[Parameter(ParameterSetName = 'Folder', ValueFromPipelineByPropertyName)]
[Parameter(ParameterSetName = 'FolderAndEmail', ValueFromPipelineByPropertyName)]
$FolderServerName,

[pscredential]
[Parameter(ParameterSetName = 'Folder', ValueFromPipelineByPropertyName)]
[Parameter(ParameterSetName = 'FolderAndEmail', ValueFromPipelineByPropertyName)]
Expand Down Expand Up @@ -1318,9 +1356,10 @@ function Add-AddressBookEntry {

if (-not [string]::IsNullOrEmpty($FolderScanPath)) {
add 'remoteFolder:' 'true'
add 'remoteFolder:type' 'smb'
add 'remoteFolder:type' $FolderScanType
add 'remoteFolder:path' $FolderScanPath
add 'remoteFolder:port' 21
add 'remoteFolder:serverName' $FolderServerName

if ($null -ne $FolderScanAccount) {
add 'remoteFolder:select' 'private'
Expand Down
1 change: 1 addition & 0 deletions Module/Templates/getObjectsProps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<item>remoteFolder:path</item>
<item>remoteFolder:port</item>
<item>remoteFolder:accountName</item>
<item>remoteFolder:serverName</item>
<item>mail:</item>
<item>mail:address</item>
<item>isSender</item>
Expand Down