From 14125aa4b0aa0bf027f77361aa80956b467324b7 Mon Sep 17 00:00:00 2001
From: "Rob Swindell (in GitKraken)" <rob@synchro.net>
Date: Thu, 2 Mar 2023 12:27:36 -0800
Subject: [PATCH] The NoAccess* text.dat strings are not appropriate 'reason'
codes
These text.dat strings require an argument (and normally used with the NOACCESS @-code which uses the noaccess_str and noaccess_val member variables), so not appropriate to use as a reason code here. Use more generic (no argument) text.dat item numbers instead.
---
src/sbbs3/userdat.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/sbbs3/userdat.c b/src/sbbs3/userdat.c
index 7cbab21019..343f7a8489 100644
--- a/src/sbbs3/userdat.c
+++ b/src/sbbs3/userdat.c
@@ -3173,11 +3173,9 @@ BOOL can_user_read_sub(scfg_t* cfg, uint subnum, user_t* user, client_t* client)
BOOL can_user_post(scfg_t* cfg, uint subnum, user_t* user, client_t* client, uint* reason)
{
if(reason!=NULL)
- *reason=NoAccessSub;
+ *reason=CantPostOnSub;
if(!can_user_access_sub(cfg, subnum, user, client))
return FALSE;
- if(reason!=NULL)
- *reason=CantPostOnSub;
if(!chk_ar(cfg,cfg->sub[subnum]->post_ar,user,client))
return FALSE;
if(cfg->sub[subnum]->misc&(SUB_QNET|SUB_FIDO|SUB_PNET|SUB_INET)
@@ -3269,7 +3267,7 @@ BOOL can_user_access_dir(scfg_t* cfg, uint dirnum, user_t* user, client_t* clien
BOOL can_user_upload(scfg_t* cfg, uint dirnum, user_t* user, client_t* client, uint* reason)
{
if(reason!=NULL)
- *reason=NoAccessDir;
+ *reason=CantUploadHere;
if(!can_user_access_dir(cfg, dirnum, user, client))
return FALSE;
if(reason!=NULL)
@@ -3298,11 +3296,9 @@ BOOL can_user_upload(scfg_t* cfg, uint dirnum, user_t* user, client_t* client, u
BOOL can_user_download(scfg_t* cfg, uint dirnum, user_t* user, client_t* client, uint* reason)
{
if(reason!=NULL)
- *reason=NoAccessDir;
+ *reason=CantDownloadFromDir;
if(!can_user_access_dir(cfg, dirnum, user, client))
return FALSE;
- if(reason!=NULL)
- *reason=CantDownloadFromDir;
if(!chk_ar(cfg,cfg->lib[cfg->dir[dirnum]->lib]->dl_ar,user,client))
return FALSE;
if(!chk_ar(cfg,cfg->dir[dirnum]->dl_ar,user,client))
--
GitLab