Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
ae325308
Commit
ae325308
authored
6 months ago
by
Rob Swindell
Browse files
Options
Downloads
Patches
Plain Diff
Don't use user's default download protocol for msg attachments
Fix issue
#801
parent
f25fafae
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#6892
passed
6 months ago
Stage: build
Stage: test
Stage: cleanup
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/sbbs3/getmsg.cpp
+2
-2
2 additions, 2 deletions
src/sbbs3/getmsg.cpp
src/sbbs3/sbbs.h
+1
-1
1 addition, 1 deletion
src/sbbs3/sbbs.h
with
3 additions
and
3 deletions
src/sbbs3/getmsg.cpp
+
2
−
2
View file @
ae325308
...
@@ -357,7 +357,7 @@ bool sbbs_t::show_msg(smb_t* smb, smbmsg_t* msg, int p_mode, post_t* post)
...
@@ -357,7 +357,7 @@ bool sbbs_t::show_msg(smb_t* smb, smbmsg_t* msg, int p_mode, post_t* post)
return
true
;
return
true
;
}
}
void
sbbs_t
::
download_msg_attachments
(
smb_t
*
smb
,
smbmsg_t
*
msg
,
bool
del
)
void
sbbs_t
::
download_msg_attachments
(
smb_t
*
smb
,
smbmsg_t
*
msg
,
bool
del
,
bool
use_default_prot
)
{
{
char
str
[
256
];
char
str
[
256
];
char
fpath
[
MAX_PATH
+
1
];
char
fpath
[
MAX_PATH
+
1
];
...
@@ -383,7 +383,7 @@ void sbbs_t::download_msg_attachments(smb_t* smb, smbmsg_t* msg, bool del)
...
@@ -383,7 +383,7 @@ void sbbs_t::download_msg_attachments(smb_t* smb, smbmsg_t* msg, bool del)
if
(
!
result
)
if
(
!
result
)
errormsg
(
WHERE
,
ERR_WRITE
,
fpath
,
filelen
);
errormsg
(
WHERE
,
ERR_WRITE
,
fpath
,
filelen
);
else
else
sendfile
(
fpath
,
useron
.
prot
,
"attachment"
);
sendfile
(
fpath
,
use_default_prot
?
useron
.
prot
:
0
,
"attachment"
);
}
}
}
}
}
else
}
else
...
...
This diff is collapsed.
Click to expand it.
src/sbbs3/sbbs.h
+
1
−
1
View file @
ae325308
...
@@ -900,7 +900,7 @@ public:
...
@@ -900,7 +900,7 @@ public:
uint
getlastmsg
(
int
subnum
,
uint32_t
*
ptr
,
time_t
*
t
);
uint
getlastmsg
(
int
subnum
,
uint32_t
*
ptr
,
time_t
*
t
);
time_t
getmsgtime
(
int
subnum
,
uint
ptr
);
time_t
getmsgtime
(
int
subnum
,
uint
ptr
);
int
getmsgnum
(
int
subnum
,
time_t
t
);
int
getmsgnum
(
int
subnum
,
time_t
t
);
void
download_msg_attachments
(
smb_t
*
,
smbmsg_t
*
,
bool
del
);
void
download_msg_attachments
(
smb_t
*
,
smbmsg_t
*
,
bool
del
,
bool
use_default_prot
=
false
);
/* readmail.cpp */
/* readmail.cpp */
int
readmail
(
uint
usernumber
,
int
which
,
int
lm_mode
=
0
);
int
readmail
(
uint
usernumber
,
int
which
,
int
lm_mode
=
0
);
...
...
This diff is collapsed.
Click to expand it.
Rob Swindell
@rswindell
mentioned in merge request
!465 (merged)
·
6 months ago
mentioned in merge request
!465 (merged)
mentioned in merge request !465
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment