Merge commit 'upstream/1.5'

[ap-utils.git] / lib / set_community.c

diff --git a/lib/set_community.c b/lib/set_community.c
index d7fc47dab81892a462c6009de144dd9637f3cff2..22f6c20edd21d8c0266f249a04ba8df0461b29a9 100644 (file)
--- a/lib/set_community.c
+++ b/lib/set_community.c
@@ -23,13 +23,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include "ap-utils.h"
-#include "ap-curses.h"
 
 #define COMMUNITY_TOP_HEADER _("Set community/password")
 #define COMMUNITY_HEADER1 _("Key Access level")
 #define COMMUNITY_HEADER2 _("Community/Password")
-#define COMMUNITY_USER  _("[U] User")
-#define COMMUNITY_ADMIN  _("[A] Administrator")
+#define COMMUNITY_USER  _("[U] User ")
+#define COMMUNITY_ADMIN  _("[A] Administrator ")
+#define COMMUNITY_MANUF  _("[M] Manufacturer ")
 #define COMMUNITY_HELP _("[key] - set community/password; W - write config to AP; Q - quit to menu")
 
 extern WINDOW *main_sub;
@@ -37,13 +37,12 @@ extern short ap_type;
 
 void AuthorizedSettings()
 {
-
     char AuthorizedUserPass[3][12] = {
        {0x2B, 0x06, 0x01, 0x04, 0x01, 0x83, 0x1A, 0x01, 0x01, 0x09, 0x01,
         0x00},
        {0x2B, 0x06, 0x01, 0x04, 0x01, 0x87, 0x29, 0x02, 0x01, 0x02, 0x01,
         0x00},
-       {0x2B, 0x06, 0x01, 0x04, 0x01, 0xe0, 0x3e, 0x01, 0x01, 0x09, 0x01,
+       {0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x09, 0x01,
         0x00}
     };
     char AuthorizedAdminPass[3][12] = {
@@ -51,7 +50,7 @@ void AuthorizedSettings()
         0x00},
        {0x2B, 0x06, 0x01, 0x04, 0x01, 0x87, 0x29, 0x02, 0x01, 0x02, 0x02,
         0x00},
-        {0x2B, 0x06, 0x01, 0x04, 0x01, 0xe0, 0x3e, 0x01, 0x01, 0x09, 0x02,
+        {0x2B, 0x06, 0x01, 0x04, 0x01, 0xE0, 0x3E, 0x01, 0x01, 0x09, 0x02,
          0x00}
     };
     char AuthorizedManufactPass[] =
@@ -69,15 +68,15 @@ void AuthorizedSettings()
     }
 
     user[0] = admin[0] = manufact[0] = '\0';
-    print_title(COMMUNITY_TOP_HEADER);
+    print_top(NULL, COMMUNITY_TOP_HEADER);
 
     mvwaddstr(main_sub, 0, 0, COMMUNITY_HEADER1);
-    mvwaddstr(main_sub, 0, 25, COMMUNITY_HEADER2);
+    mvwaddstr(main_sub, 0, 37, COMMUNITY_HEADER2);
     mvwaddstr(main_sub, 1, 0, COMMUNITY_USER);
     mvwaddstr(main_sub, 2, 0, COMMUNITY_ADMIN);
 
     if (ap_type == ATMEL410 || ap_type == ATMEL12350) {
-       mvwaddstr(main_sub, 3, 0, _("[M] Manufacturer"));
+       mvwaddstr(main_sub, 3, 0, COMMUNITY_MANUF);
     }
     wrefresh(main_sub);
 
@@ -89,22 +88,22 @@ void AuthorizedSettings()
            continue;
        case 'U':
        case 'u':
-/*         get_value(user, 1, 25, sizeof(user), ANY_STRING, 0, 0, NULL); */
-           get_pass(user, 1, 25, sizeof(user));
+/*         get_value(user, 1, 37, sizeof(user), ANY_STRING, 0, 0, NULL); */
+           get_pass(user, 1, 37, sizeof(user));
            continue;
        case 'A':
        case 'a':
-/*         get_value(admin, 2, 25, sizeof(admin), ANY_STRING, 0, 0, NULL); */
-           get_pass(admin, 2, 25, sizeof(admin));
+/*         get_value(admin, 2, 37, sizeof(admin), ANY_STRING, 0, 0, NULL); */
+           get_pass(admin, 2, 37, sizeof(admin));
            continue;
        case 'M':
        case 'm':
            if (ap_type == ATMEL410 || ap_type == ATMEL12350)
 /*
-               get_value(manufact, 3, 25, sizeof(manufact), ANY_STRING,
+               get_value(manufact, 3, 37, sizeof(manufact), ANY_STRING,
                    0, 0, NULL);
 */
-               get_pass(manufact, 3, 25, sizeof(manufact));
+               get_pass(manufact, 3, 37, sizeof(manufact));
            continue;
        case 'Q':
        case 'q':
@@ -141,6 +140,8 @@ void AuthorizedSettings()
                print_helperr(ERR_SET);
                goto exit;
            }
+           wbkgd(main_sub, A_NORMAL);
+           wrefresh(main_sub);
            break;
        }
        break;
@@ -151,6 +152,6 @@ void AuthorizedSettings()
     getch();
   quit:
     print_help("");
-    print_title("");
+    print_top(NULL, NULL);
     clear_main(0);
 }