Merge pull request #1674 from wwivbbs/1673-make-list-plus-switchable

Make ListPlus switchable

Author: ericpareja

bbs/defaults.cpp

@@ -164,7 +164,12 @@ static void print_cur_stat() {
                (a()->user()->has_flag(User::fullScreenReader) ? "Full-Screen" : "Traditional"));
   }
   bout.print("|#1I|#9) Internet Address  : |#2{}\r\n", inet_addr);
-  bout.pl("|#1K|#9) Configure Menus");
+  bout.print("|#1K|#9) Configure Menus                      ");
+  if (okansi()) {
+    bout.print("|#1L|#9) ListPlus Enabled   : |#2{}", YesNoString(a()->user()->data.lp_options & cfl_enable));
+  }
+  bout.nl();
+
   if (num_instances() > 1) {
     bout.print("|#1M|#9) Allow user msgs   : |#2{:<16} |#1N|#9) Configure QWK", YesNoString(!a()->user()->ignore_msgs()));
   }
@@ -737,7 +742,7 @@ void defaults(bool& need_menu_reload) {
     bout.outstr("|#9Defaults: ");
     std::string allowable = "Q?1234567BCDIKMNTUW";
     if (okansi()) {
-      allowable.append("89AS");
+      allowable.append("89ALS");
       if (a()->fullscreen_read_prompt()) {
         allowable.push_back('G');
       }
@@ -803,6 +808,9 @@ void defaults(bool& need_menu_reload) {
       wwiv::bbs::menus::ConfigUserMenuSet("");
       need_menu_reload = true;
       break;
+    case 'L':
+      a()->user()->data.lp_options ^= cfl_enable;
+      break;
     case 'M':
       a()->user()->toggle_flag(User::noMsgs);
       break;

bbs/listplus.cpp

@@ -932,6 +932,8 @@ static void update_user_config_screen(uploadsrec* u, int which) {
   bout.clreol();
   bout.nl();
   bout.clreol();
+  bout.nl();
+  bout.clreol();
   bout.goxy(1, 21);
 
   search_record sr{};
@@ -1019,12 +1021,7 @@ void config_file_list() {
         which = 10;
         break;
       }
-
-      if (a()->user()->data.lp_options & bit) {
-        a()->user()->data.lp_options &= ~bit;
-      } else {
-        a()->user()->data.lp_options |= bit;
-      }
+      a()->user()->data.lp_options ^= bit;
       break;
 
     case '!':

bbs/xfer.cpp

@@ -300,7 +300,7 @@ void listfiles() {
     return;
   }
 
-  if (okansi()) {
+  if (okansi() && a()->user()->data.lp_options & cfl_enable ) {
     listfiles_plus(LP_LIST_DIR);
     return;
   }
@@ -345,7 +345,7 @@ void nscandir(uint16_t nDirNum, bool& need_title, bool *abort) {
   a()->set_current_user_dir_num(nDirNum);
   dliscan();
   if (this_date >= a()->sess().nscandate()) {
-    if (okansi()) {
+    if (okansi() && a()->user()->data.lp_options & cfl_enable) {
       *abort = listfiles_plus(LP_NSCAN_DIR) ? 1 : 0;
       a()->set_current_user_dir_num(old_cur_dir);
       return;
@@ -391,7 +391,7 @@ void nscanall() {
       tmp_disable_conf(true);
     }
   }
-  if (okansi()) {
+  if (okansi() && a()->user()->data.lp_options & cfl_enable) {
     const auto save_dir = a()->current_user_dir_num();
     listfiles_plus(LP_NSCAN_NSCAN);
     if (scan_all_confs) {
@@ -436,7 +436,7 @@ void searchall() {
     bout.pl("|#6No directories available.");
     return;
   }
-  if (okansi()) {
+  if (okansi() && a()->user()->data.lp_options & cfl_enable ) {
     listfiles_plus(LP_SEARCH_ALL);
     return;
   }

bbs/xferovl.cpp

@@ -734,12 +734,20 @@ void xfer_defaults() {
   do {
     bout.cls();
     bout.outstr("|#7[|#21|#7]|#1 Set New-Scan Directories.\r\n");
-    bout.outstr("|#7[|#22|#7]|#1 Set Default Protocol.\r\n");
-    bout.print("|#7[|#23|#7]|#1 New-Scan Transfer after Message Base ({}).\r\n",
+    bout.print("|#7[|#22|#7]|#1 Set Default Protocol: |#7(|#2{}|#7).\r\n",prot_name(a()->user()->default_protocol()));
+    bout.print("|#7[|#23|#7]|#1 New-Scan Transfer after Message Base: |#7(|#2{}|#7)\r\n",
                YesNoString(a()->user()->newscan_files()));
-    bout.print("|#7[|#24|#7]|#1 Number of lines of extended description to print [{} line(s)].\r\n",
+    bout.print("|#7[|#24|#7]|#1 Number of lines of extended description to print: #|7[|#2{} line(s)|#7]|#1.\r\n",
                a()->user()->GetNumExtended());
-    const std::string onek_options = "Q12345";
+    if (okansi()) {
+      bout.print("|#7[|#2L|#7]|#1 ListPlus Enabled: |#7(|#2{}|#7)\r\n", YesNoString(a()->user()->data.lp_options & cfl_enable));
+    }
+    std::string onek_options = "Q12345L";
+    if (a()->user()->data.lp_options & cfl_enable) {
+	bout.print("|#7[|#2K|#7]|#1 Configure ListPlus\r\n");
+	onek_options.append("K");
+    }
+
     bout.outstr("|#7[|#2Q|#7]|#1 Quit.\r\n\n");
     bout.outstr("|#5Which? ");
     char ch = onek(onek_options);
@@ -775,13 +783,19 @@ void xfer_defaults() {
         }
       }
       break;
+    case 'L':
+      a()->user()->data.lp_options ^= cfl_enable;
+      break;
+    case 'K':
+      config_file_list();
+      break;
     }
   }
   while (!done && !a()->sess().hangup());
 }
 
 void finddescription() {
-  if (okansi()) {
+  if (okansi() && a()->user()->data.lp_options & cfl_enable ) {
     listfiles_plus(LP_SEARCH_ALL);
     return;
   }

sdk/user.h

@@ -47,6 +47,7 @@ static constexpr uint32_t unused_cfl_times_a_day_dloaded = 0x00000100;
 static constexpr uint32_t unused_cfl_days_between_dloads = 0x00000200;
 static constexpr uint32_t cfl_description = 0x00000400;
 static constexpr uint32_t cfl_header = 0x80000000;
+static constexpr uint32_t cfl_enable = 0x10000000;
 
 namespace wwiv::sdk {
 struct validation_config_t;
@@ -1076,4 +1077,4 @@ int years_old(const User* u, core::Clock& clock);
 
 }  // namespace wwiv::sdk
 
-#endif
+#endif