Clearer types in code rather than void pointers

#926
bibledit · Jan 6, 2024 · 0f87a7f · 0f87a7f
1 parent 8831aa4
commit 0f87a7f
Show file tree

Hide file tree

Showing 23 changed files with 50 additions and 52 deletions.
diff --git a/access/logic.cpp b/access/logic.cpp
@@ -35,7 +35,7 @@ int view_resources_role ()
 }
 
 
-bool privilege_view_resources (void * webserver_request, string user)
+bool privilege_view_resources (Webserver_Request& webserver_request, string user)
 {
   int level {0};
   user_level (webserver_request, user, level);
@@ -50,7 +50,7 @@ int view_notes_role ()
 }
 
 
-bool privilege_view_notes (void * webserver_request, string user)
+bool privilege_view_notes (Webserver_Request& webserver_request, string user)
 {
   int level {0};
   user_level (webserver_request, user, level);
@@ -65,7 +65,7 @@ int create_comment_notes_role ()
 }
 
 
-bool privilege_create_comment_notes (void * webserver_request, string user)
+bool privilege_create_comment_notes (Webserver_Request& webserver_request, string user)
 {
   int level {0};
   user_level (webserver_request, user, level);
@@ -80,13 +80,12 @@ int delete_consultation_notes_role ()
 }
 
 
-bool privilege_delete_consultation_notes (void * webserver_request, string user)
+bool privilege_delete_consultation_notes (Webserver_Request& webserver_request, string user)
 {
   int level {0};
   user_level (webserver_request, user, level);
   if (level >= delete_consultation_notes_role ()) return true;
-  Webserver_Request * request = static_cast<Webserver_Request *>(webserver_request);
-  return request->database_config_user ()->getPrivilegeDeleteConsultationNotesForUser (user);
+  return webserver_request.database_config_user ()->getPrivilegeDeleteConsultationNotesForUser (user);
 }
 
 
@@ -96,13 +95,12 @@ int use_advanced_mode_role ()
 }
 
 
-bool privilege_use_advanced_mode (void * webserver_request, string user)
+bool privilege_use_advanced_mode (Webserver_Request& webserver_request, string user)
 {
   int level {0};
   user_level (webserver_request, user, level);
   if (level >= use_advanced_mode_role ()) return true;
-  Webserver_Request * request = static_cast<Webserver_Request *>(webserver_request);
-  return request->database_config_user ()->getPrivilegeUseAdvancedModeForUser (user);
+  return webserver_request.database_config_user ()->getPrivilegeUseAdvancedModeForUser (user);
 }
 
 
@@ -112,26 +110,24 @@ int set_stylesheets_role ()
 }
 
 
-bool privilege_set_stylesheets (void * webserver_request, string user)
+bool privilege_set_stylesheets (Webserver_Request& webserver_request, string user)
 {
   int level {0};
   user_level (webserver_request, user, level);
   if (level >= set_stylesheets_role ()) return true;
-  Webserver_Request * request = static_cast<Webserver_Request *>(webserver_request);
-  return request->database_config_user ()->getPrivilegeSetStylesheetsForUser (user);
+  return webserver_request.database_config_user ()->getPrivilegeSetStylesheetsForUser (user);
 }
 
 
-void user_level (void * webserver_request, string & user, int & level)
+void user_level (Webserver_Request& webserver_request, string & user, int & level)
 {
-  Webserver_Request * request = static_cast<Webserver_Request *>(webserver_request);
   if (user.empty ()) {
     // If no user is given, take the user from the session.
-    user = request->session_logic ()->currentUser ();
-    level = request->session_logic ()->currentLevel ();
+    user = webserver_request.session_logic ()->currentUser ();
+    level = webserver_request.session_logic ()->currentLevel ();
   } else {
     // If a user is given, take the matching level from the database.
-    level = request->database_users ()->get_level (user);
+    level = webserver_request.database_users ()->get_level (user);
   }
 }
 

diff --git a/access/logic.h b/access/logic.h
@@ -21,31 +21,33 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 #define PRIVILEGE_VIEW_RESOURCES 1
 
 namespace access_logic {
 
 int view_resources_role ();
-bool privilege_view_resources (void * webserver_request, std::string user = std::string());
+bool privilege_view_resources (Webserver_Request& webserver_request, std::string user = std::string());
 
 #define PRIVILEGE_VIEW_NOTES 2
 int view_notes_role ();
-bool privilege_view_notes (void * webserver_request, std::string user = std::string());
+bool privilege_view_notes (Webserver_Request& webserver_request, std::string user = std::string());
 
 #define PRIVILEGE_CREATE_COMMENT_NOTES 3
 int create_comment_notes_role ();
-bool privilege_create_comment_notes (void * webserver_request, std::string user = std::string());
+bool privilege_create_comment_notes (Webserver_Request& webserver_request, std::string user = std::string());
 
 int delete_consultation_notes_role ();
-bool privilege_delete_consultation_notes (void * webserver_request, std::string user = std::string());
+bool privilege_delete_consultation_notes (Webserver_Request& webserver_request, std::string user = std::string());
 
 int use_advanced_mode_role ();
-bool privilege_use_advanced_mode (void * webserver_request, std::string user = std::string());
+bool privilege_use_advanced_mode (Webserver_Request& webserver_request, std::string user = std::string());
 
 int set_stylesheets_role ();
-bool privilege_set_stylesheets (void * webserver_request, std::string user = std::string());
+bool privilege_set_stylesheets (Webserver_Request& webserver_request, std::string user = std::string());
 
-void user_level (void * webserver_request, std::string& user, int& level);
+void user_level (Webserver_Request& webserver_request, std::string& user, int& level);
 void create_client_files ();
 
 std::set <std::string> default_privilege_usernames ();

diff --git a/bb/settings.cpp b/bb/settings.cpp
@@ -100,7 +100,7 @@ std::string bible_settings (Webserver_Request& webserver_request)
 
   // Whether the user has the privilege to change the stylesheet.
   const std::string current_user = webserver_request.session_logic()->currentUser ();
-  bool privilege_stylesheet = access_logic::privilege_set_stylesheets (std::addressof(webserver_request), current_user);
+  bool privilege_stylesheet = access_logic::privilege_set_stylesheets (webserver_request, current_user);
   if (privilege_stylesheet) view.enable_zone ("privilege_stylesheet");
 
 

diff --git a/manage/privileges.cpp b/manage/privileges.cpp
@@ -61,7 +61,7 @@ string manage_privileges (Webserver_Request& webserver_request)
   if (user.empty()) user = webserver_request.post["val1"];
   view.set_variable ("user", user);
   int level {0};
-  access_logic::user_level (std::addressof(webserver_request), user, level);
+  access_logic::user_level (webserver_request, user, level);
 
 
   // Usernames for setting default new user privilege.
@@ -96,7 +96,7 @@ string manage_privileges (Webserver_Request& webserver_request)
   if (level >= access_logic::view_resources_role () && defusers.find (user) == defusers.end ()) {
     view.set_variable ("viewnotesdisabled", filter::strings::get_disabled (true));
   }
-  state = access_logic::privilege_view_notes (std::addressof(webserver_request), user);
+  state = access_logic::privilege_view_notes (webserver_request, user);
   view.set_variable ("viewnoteschecked", filter::strings::get_checkbox_status (state));
 
 
@@ -109,7 +109,7 @@ string manage_privileges (Webserver_Request& webserver_request)
   if (level >= access_logic::view_resources_role () && defusers.find (user) == defusers.end ()) {
     view.set_variable ("createcommentnotesdisabled", filter::strings::get_disabled (true));
   }
-  state = access_logic::privilege_create_comment_notes (std::addressof(webserver_request), user);
+  state = access_logic::privilege_create_comment_notes (webserver_request, user);
   view.set_variable ("createcommentnoteschecked", filter::strings::get_checkbox_status (state));
 
 
@@ -121,7 +121,7 @@ string manage_privileges (Webserver_Request& webserver_request)
   if (level >= access_logic::delete_consultation_notes_role () && defusers.find (user) == defusers.end ()) {
     view.set_variable ("deletenotesdisabled", filter::strings::get_disabled (true));
   }
-  state = access_logic::privilege_delete_consultation_notes (std::addressof(webserver_request), user);
+  state = access_logic::privilege_delete_consultation_notes (webserver_request, user);
   view.set_variable ("deletenoteschecked", filter::strings::get_checkbox_status (state));
 
 
@@ -132,7 +132,7 @@ string manage_privileges (Webserver_Request& webserver_request)
   if (level >= access_logic::use_advanced_mode_role () && defusers.find (user) == defusers.end ()) {
     view.set_variable ("useadvancedmodedisabled", filter::strings::get_disabled (true));
   }
-  state = access_logic::privilege_use_advanced_mode (std::addressof(webserver_request), user);
+  state = access_logic::privilege_use_advanced_mode (webserver_request, user);
   view.set_variable ("useadvancedmodechecked", filter::strings::get_checkbox_status (state));
 
 
@@ -143,7 +143,7 @@ string manage_privileges (Webserver_Request& webserver_request)
   if (level >= access_logic::set_stylesheets_role () && defusers.find (user) == defusers.end ()) {
     view.set_variable ("editstylesheetsdisabled", filter::strings::get_disabled (true));
   }
-  state = access_logic::privilege_set_stylesheets (std::addressof(webserver_request), user);
+  state = access_logic::privilege_set_stylesheets (webserver_request, user);
   view.set_variable ("editstylesheetschecked", filter::strings::get_checkbox_status (state));
 
 

diff --git a/notes/actions.cpp b/notes/actions.cpp
@@ -173,7 +173,7 @@ string notes_actions (Webserver_Request& webserver_request)
   if (level >= Filter_Roles::manager ()) view.enable_zone ("rawedit");
 
 
-  if (access_logic::privilege_delete_consultation_notes (std::addressof(webserver_request)))
+  if (access_logic::privilege_delete_consultation_notes (webserver_request))
     view.enable_zone ("deletenote");
   bool marked = database_notes.is_marked_for_deletion (id);
   if (marked) view.enable_zone ("marked");

diff --git a/notes/comment.cpp b/notes/comment.cpp
@@ -44,7 +44,7 @@ string notes_comment_url ()
 
 bool notes_comment_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_create_comment_notes (std::addressof(webserver_request));
+  return access_logic::privilege_create_comment_notes (webserver_request);
 }
 
 

diff --git a/notes/create.cpp b/notes/create.cpp
@@ -47,7 +47,7 @@ string notes_create_url ()
 
 bool notes_create_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_create_comment_notes (std::addressof(webserver_request));
+  return access_logic::privilege_create_comment_notes (webserver_request);
 }
 
 

diff --git a/notes/index.cpp b/notes/index.cpp
@@ -38,7 +38,7 @@ string notes_index_url ()
 
 bool notes_index_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_notes (std::addressof(webserver_request));
+  return access_logic::privilege_view_notes (webserver_request);
 }
 
 
@@ -99,7 +99,7 @@ string notes_index (Webserver_Request& webserver_request)
   }
 
   // Whether the user can create a new note.
-  if (access_logic::privilege_create_comment_notes (std::addressof(webserver_request))) {
+  if (access_logic::privilege_create_comment_notes (webserver_request)) {
     view.enable_zone ("create");
   }
 

diff --git a/notes/note.cpp b/notes/note.cpp
@@ -45,7 +45,7 @@ string notes_note_url ()
 
 bool notes_note_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_notes (std::addressof(webserver_request));
+  return access_logic::privilege_view_notes (webserver_request);
 }
 
 
@@ -140,7 +140,7 @@ string notes_note (Webserver_Request& webserver_request)
   if (Filter_Roles::access_control (webserver_request, Filter_Roles::consultant ())) {
     view.enable_zone ("consultant");
   }
-  if (access_logic::privilege_create_comment_notes (std::addressof(webserver_request))) {
+  if (access_logic::privilege_create_comment_notes (webserver_request)) {
     view.enable_zone ("comment");
   }
 

diff --git a/notes/notes.cpp b/notes/notes.cpp
@@ -42,7 +42,7 @@ string notes_notes_url ()
 
 bool notes_notes_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_notes (std::addressof(webserver_request));
+  return access_logic::privilege_view_notes (webserver_request);
 }
 
 

diff --git a/notes/poll.cpp b/notes/poll.cpp
@@ -40,7 +40,7 @@ string notes_poll_url ()
 
 bool notes_poll_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_notes (std::addressof(webserver_request));
+  return access_logic::privilege_view_notes (webserver_request);
 }
 
 

diff --git a/notes/select.cpp b/notes/select.cpp
@@ -44,7 +44,7 @@ string notes_select_url ()
 
 bool notes_select_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_notes (std::addressof(webserver_request));
+  return access_logic::privilege_view_notes (webserver_request);
 }
 
 

diff --git a/personalize/index.cpp b/personalize/index.cpp
@@ -447,7 +447,7 @@ string personalize_index (Webserver_Request& webserver_request)
 
 
   // Enable the sections with settings relevant to the user and device.
-  bool resources = access_logic::privilege_view_resources (std::addressof(webserver_request));
+  bool resources = access_logic::privilege_view_resources (webserver_request);
   if (resources) view.enable_zone ("resources");
   bool bibles = Filter_Roles::access_control (webserver_request, Filter_Roles::translator ());
   auto [ read, write ] = access_bible::any (webserver_request);

diff --git a/resource/comparative1edit.cpp b/resource/comparative1edit.cpp
@@ -50,7 +50,7 @@ string resource_comparative1edit_url ()
 
 bool resource_comparative1edit_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_resources (std::addressof(webserver_request));
+  return access_logic::privilege_view_resources (webserver_request);
 }
 
 

diff --git a/resource/get.cpp b/resource/get.cpp
@@ -36,7 +36,7 @@ string resource_get_url ()
 
 bool resource_get_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_resources (std::addressof(webserver_request));
+  return access_logic::privilege_view_resources (webserver_request);
 }
 
 

diff --git a/resource/index.cpp b/resource/index.cpp
@@ -44,7 +44,7 @@ string resource_index_url ()
 
 bool resource_index_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_resources (std::addressof(webserver_request));
+  return access_logic::privilege_view_resources (webserver_request);
 }
 
 

diff --git a/resource/organize.cpp b/resource/organize.cpp
@@ -48,7 +48,7 @@ string resource_organize_url ()
 
 bool resource_organize_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_resources (std::addressof(webserver_request));
+  return access_logic::privilege_view_resources (webserver_request);
 }
 
 

diff --git a/resource/select.cpp b/resource/select.cpp
@@ -54,7 +54,7 @@ string resource_select_url ()
 
 bool resource_select_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_resources (std::addressof(webserver_request));
+  return access_logic::privilege_view_resources (webserver_request);
 }
 
 

diff --git a/resource/translated1edit.cpp b/resource/translated1edit.cpp
@@ -51,7 +51,7 @@ string resource_translated1edit_url ()
 
 bool resource_translated1edit_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_resources (std::addressof(webserver_request));
+  return access_logic::privilege_view_resources (webserver_request);
 }
 
 

diff --git a/resource/unload.cpp b/resource/unload.cpp
@@ -34,7 +34,7 @@ string resource_unload_url ()
 
 bool resource_unload_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_resources (std::addressof(webserver_request));
+  return access_logic::privilege_view_resources (webserver_request);
 }
 
 

diff --git a/resource/user1view.cpp b/resource/user1view.cpp
@@ -44,7 +44,7 @@ string resource_user1view_url ()
 
 bool resource_user1view_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_resources (std::addressof(webserver_request));
+  return access_logic::privilege_view_resources (webserver_request);
 }
 
 

diff --git a/resource/user9view.cpp b/resource/user9view.cpp
@@ -41,7 +41,7 @@ string resource_user9view_url ()
 
 bool resource_user9view_acl (Webserver_Request& webserver_request)
 {
-  return access_logic::privilege_view_resources (std::addressof(webserver_request));
+  return access_logic::privilege_view_resources (webserver_request);
 }
 
 

diff --git a/user/notifications.cpp b/user/notifications.cpp
@@ -49,7 +49,7 @@ bool user_notifications_acl (Webserver_Request& webserver_request)
   if (Filter_Roles::access_control (webserver_request, Filter_Roles::consultant ()))
     return true;
   // Whoever can view notes has access.
-  if (access_logic::privilege_view_notes (std::addressof(webserver_request)))
+  if (access_logic::privilege_view_notes (webserver_request))
     return true;
   // Whoever has access to a Bible has access to this page.
   auto [ read, write ] = access_bible::any (webserver_request);
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ string notes_comment_url () @@
     bool notes_comment_acl (Webserver_Request& webserver_request)
     {
-      return access_logic::privilege_create_comment_notes (std::addressof(webserver_request));
+      return access_logic::privilege_create_comment_notes (webserver_request);
     }
@@ Expand Down @@