--- sbbs/src/sbbs3/con_hi.cpp	2018/04/24 16:41:23	1.1
+++ sbbs/src/sbbs3/con_hi.cpp	2018/04/24 16:42:35	1.1.1.2
@@ -2,13 +2,13 @@
 
 /* Synchronet hi-level console routines */
 
-/* $Id: con_hi.cpp,v 1.1 2018/04/24 16:41:23 root Exp $ */
+/* $Id: con_hi.cpp,v 1.1.1.2 2018/04/24 16:42:35 root Exp $ */
 
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2006 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2009 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -39,37 +39,21 @@
 
 /****************************************************************************/
 /* Redraws str using i as current cursor position and l as length           */
+/* Currently only used by getstr() - so should be moved to getstr.cpp?		*/
 /****************************************************************************/
 void sbbs_t::redrwstr(char *strin, int i, int l, long mode)
 {
-    char str[256],c;
-
-	sprintf(str,"%-*.*s",l,l,strin);
-	c=i;
-	while(c--)
-		outchar(BS);
+	cursor_left(i);
 	if(mode&K_MSG)
-		bputs(str);
+		bprintf("%-*.*s",l,l,strin);
 	else
-		rputs(str);
-	if(term_supports(ANSI)) {
-		cleartoeol();
-		if(i<l)
-			cursor_left(l-i); 
-	} else {
-		while(c<cols-1) { /* clear to end of line */
-			outchar(' ');
-			c++; 
-		}
-		while(c>l) { /* back space to end of string */
-			outchar(BS);
-			c--; 
-		} 
-	}
+		column+=rprintf("%-*.*s",l,l,strin);
+	cleartoeol();
+	if(i<l)
+		cursor_left(l-i); 
 }
 
-
-int sbbs_t::uselect(int add, uint n, char *title, char *item, uchar *ar)
+int sbbs_t::uselect(int add, uint n, const char *title, const char *item, const uchar *ar)
 {
 	char	str[128];
 	int		i;
@@ -79,13 +63,14 @@ int sbbs_t::uselect(int add, uint n, cha
 		uselect_total=0;
 
 	if(add) {
-		if(ar && !chk_ar(ar,&useron))
+		if(ar && !chk_ar(ar,&useron,&client))
 			return(0);
 		if(!uselect_total)
 			bprintf(text[SelectItemHdr],title);
 		uselect_num[uselect_total++]=n;
 		bprintf(text[SelectItemFmt],uselect_total,item);
-		return(0); }
+		return(0); 
+	}
 
 	if(!uselect_total)
 		return(-1);
@@ -108,7 +93,8 @@ int sbbs_t::uselect(int add, uint n, cha
 				return(uselect_num[u]);
 		if(n<t)
 			return(uselect_num[n]);
-		return(-1); }
+		return(-1); 
+	}
 	return(uselect_num[i-1]);
 }
 
@@ -121,30 +107,20 @@ bool sbbs_t::chksyspass()
 	int 	orgcon=console;
 
 	if(online==ON_REMOTE && !(cfg.sys_misc&SM_R_SYSOP)) {
-		logline("S!","Remote sysop access disabled");
+		logline(LOG_NOTICE,"S!","Remote sysop access disabled");
 		return(false);
 	}
-#if 0	/* no local logins in v3 */
-	if(online==ON_LOCAL) {
-		if(!(cfg.sys_misc&SM_L_SYSOP))
-			return(false);
-		if(!(cfg.node_misc&NM_SYSPW) && !(cfg.sys_misc&SM_REQ_PW))
-			return(false); 
-	}
-#endif
 	bputs(text[SystemPassword]);
-	console&=~(CON_R_ECHO|CON_L_ECHO);
-	getstr(str,40,K_UPPER);
-	console=orgcon;
+	getstr(str,40,K_UPPER|K_NOECHO);
 	CRLF;
 	if(strcmp(cfg.sys_pass,str)) {
 		if(cfg.sys_misc&SM_ECHO_PW) 
-			sprintf(str2,"%s #%u System password attempt: '%s'"
+			SAFEPRINTF3(str2,"%s #%u System password attempt: '%s'"
 				,useron.alias,useron.number,str);
 		else
-			sprintf(str2,"%s #%u System password verification failure"
+			SAFEPRINTF2(str2,"%s #%u System password verification failure"
 				,useron.alias,useron.number);
-		logline("S!",str2);
+		logline(LOG_NOTICE,"S!",str2);
 		return(false); 
 	}
 	return(true);