* Userfile is now sorted correctly

svn: 527

doc/UPDATES

@@ -30,6 +30,7 @@ This is a summary of ChangeLog basically.
 27.Changed bad op-cookie (TS) to LOG_DEBUG.
 28.cmd_newleaf now modifies USERENTRY_ADDED for .whois
 29.Passing '?' as the bot to cmd_botcmd will send the cmd to a random leaf.
+30.Userfile is now sorted correctly.
 
 1.0.13
 1.Fixed a fatal bug in console_gotshare()

src/userrec.c

@@ -434,23 +434,21 @@ int sort_compare(struct userrec *a, struct userrec *b)
    * return true if (a > b)
    */
   if (a->flags & b->flags & USER_BOT) {
-    if (~bot_flags(a) & bot_flags(b) & BOT_HUB)
+    if (bot_hublevel(a) > bot_hublevel(b))
       return 1;
-    if (bot_flags(a) & ~bot_flags(b) & BOT_HUB)
+    else if (bot_hublevel(a) < bot_hublevel(b))
       return 0;
-/*    if (~bot_flags(a) & bot_flags(b) & BOT_ALT)
-      return 1;
-    if (bot_flags(a) & ~bot_flags(b) & BOT_ALT)
-      return 0;*/
-    if (~bot_flags(a) & bot_flags(b) & BOT_LEAF)
-      return 1;
-    if (bot_flags(a) & ~bot_flags(b) & BOT_LEAF)
+    else if (bot_hublevel(a) == bot_hublevel(b) && bot_hublevel(a) == 999)
       return 0;
   } else {
     if (~a->flags & b->flags & USER_BOT)
       return 1;
     if (a->flags & ~b->flags & USER_BOT)
       return 0;
+    if (~a->flags & b->flags & USER_ADMIN)
+      return 1;
+    if (a->flags & ~b->flags & USER_ADMIN)
+      return 0;
     if (~a->flags & b->flags & USER_OWNER)
       return 1;
     if (a->flags & ~b->flags & USER_OWNER)