Burned slist, rewrote operservs XLine code

2 files changed, 15 insertions, 15 deletions

diff --git a/data/example.conf b/data/example.conf
index aa7d9ab8b..0954b8d0d 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -603,7 +603,7 @@ options
  *
  *   operserv/global       operserv/news         operserv/stats      operserv/kick
  *   operserv/mode         operserv/session      operserv/modlist    operserv/ignore
- *   operserv/chankill     operserv/akill        operserv/sqline     operserv/sgline
+ *   operserv/chankill     operserv/akill        operserv/sqline     operserv/snline
  *   operserv/szline       operserv/clearmodes   operserv/staff      operserv/defcon
  *   operserv/modload      operserv/jupe         operserv/set        operserv/noop
  *   operserv/quit         operserv/update       operserv/reload     operserv/restart
@@ -636,7 +636,7 @@ opertype
 	inherits = "Helper, Another Helper"
 
 	/* What commands (see above) this opertype may use */
-	commands = "chanserv/list chanserv/suspend chanserv/status chanserv/topic memoserv/staff nickserv/sendpass nickserv/resetpass nickserv/suspend operserv/mode operserv/chankill operserv/szline operserv/akill operserv/session operserv/clearmodes operserv/modlist operserv/sqline operser/staff operserv/kick operserv/ignore operserv/sgline"
+	commands = "chanserv/list chanserv/suspend chanserv/status chanserv/topic memoserv/staff nickserv/sendpass nickserv/resetpass nickserv/suspend operserv/mode operserv/chankill operserv/szline operserv/akill operserv/session operserv/clearmodes operserv/modlist operserv/sqline operserv/staff operserv/kick operserv/ignore operserv/snline"
 
 	/* What privs (see above) this opertype has */
 	privs = "chanserv/auspex chanserv/no-register-limit memoserv/* nickserv/auxpex nickserv/confirm"
@@ -1264,7 +1264,7 @@ operserv
 	 * The core modules to load for OperServ. This is a space separated list that corresponds
 	 * to the base names of the modules for OperServ. This directive is optional, but highly recommended.
 	 */
-	modules = "os_help os_global os_stats os_staff os_mode os_kick os_clearmodes os_akill os_sgline os_sqline os_szline os_chanlist os_userlist os_news os_session os_noop os_jupe os_ignore os_set os_reload os_update os_restart os_quit os_shutdown os_defcon os_chankill os_svsnick os_oline os_umode os_modload os_modunload os_modlist os_modinfo"
+	modules = "os_help os_global os_stats os_staff os_mode os_kick os_clearmodes os_akill os_snline os_sqline os_szline os_chanlist os_userlist os_news os_session os_noop os_jupe os_ignore os_set os_reload os_update os_restart os_quit os_shutdown os_defcon os_chankill os_svsnick os_oline os_umode os_modload os_modunload os_modlist os_modinfo"
 
 	/*
 	 * If set, Services Admins will be able to use SUPERADMIN [ON|OFF] which will temporarily grant
@@ -1280,12 +1280,12 @@ operserv
 	logmaxusers = yes
 
 	/*
-	 * These define the default expiration times for, respectively, AKILLs, CHANKILLs, SGLINEs,
+	 * These define the default expiration times for, respectively, AKILLs, CHANKILLs, SNLINEs,
 	 * SQLINEs, and SZLINEs.
 	 */
 	autokillexpiry = 30d
 	chankillexpiry = 30d
-	sglineexpiry = 30d
+	snlineexpiry = 30d
 	sqlineexpiry = 30d
 	szlineexpiry = 30d
 
@@ -1297,11 +1297,11 @@ operserv
 	#akillonadd = yes
 
 	/*
-	 * If set, this option will make Services send an (SVS)KILL command immediately after SGLINE ADD.
-	 * This eliminates the need for killingthe user after the SGLINE has been added. This directive
+	 * If set, this option will make Services send an (SVS)KILL command immediately after SNLINE ADD.
+	 * This eliminates the need for killingthe user after the SNLINE has been added. This directive
 	 * is optional.
 	 */
-	#killonsgline = yes
+	#killonsnline = yes
 
 	/*
 	 * If set, this option will make Services send an (SVS)KILL command immediately after SQLINE ADD.
@@ -1321,13 +1321,13 @@ operserv
 	 * -    osclearmodes: OperServ's CLEARMODES command was used
 	 * -          oskick: OperServ's KICK command was used
 	 * -         osakill: OperServ's AKILL command was used
-	 * -        ossgline: OperServ's SGLINE command was used
+	 * -        ossnline: OperServ's SNLINE command was used
 	 * -        ossqline: OperServ's SQLINE command was used
 	 * -        osszline: OperServ's SZLINE command was used
 	 * -          osnoop: OperServ's NOOP command was used
 	 * -          osjupe: OperServ's JUPE command was used
 	 * -     akillexpire: An AKILL has expired
-	 * -    sglineexpire: An SGLINE has expired
+	 * -    snlineexpire: An SNLINE has expired
 	 * -    sqlineexpire: An SQLINE has expired
 	 * -    szlineexpire: An SZLINE has expired
 	 * - exceptionexpire: A session exception has expired
@@ -1340,7 +1340,7 @@ operserv
 	 *
 	 * This directive is optional, if left blank, there will be no notifications.
 	 */
-	notifications="osglobal osmode osclearmodes oskick osakill ossgline ossqline osszline osnoop osjupe getpass setpass forbid drop"
+	notifications="osglobal osmode osclearmodes oskick osakill ossnline ossqline osszline osnoop osjupe getpass setpass forbid drop"
 
 	/*
 	 * Enables session limiting. Session limiting prevents users from connecting more than a certain
diff --git a/data/tables.sql b/data/tables.sql
index 23ba0ca50..deeef41cc 100644
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -322,7 +322,7 @@ CREATE TABLE anope_os_core (
   maxusercnt int(11) NOT NULL default '0',
   maxusertime int(10) unsigned NOT NULL default '0',
   akills_count int(11) NOT NULL default '0',
-  sglines_count int(11) NOT NULL default '0',
+  snlines_count int(11) NOT NULL default '0',
   sqlines_count int(11) NOT NULL default '0',
   szlines_count int(11) NOT NULL default '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
@@ -346,11 +346,11 @@ CREATE TABLE anope_os_exceptions (
 -- --------------------------------------------------------
 
 --
--- Table structure for table 'anope_os_sxlines'
+-- Table structure for table 'anope_os_xlines'
 --
 
-DROP TABLE IF EXISTS anope_os_sxlines;
-CREATE TABLE anope_os_sxlines (
+DROP TABLE IF EXISTS anope_os_xlines;
+CREATE TABLE anope_os_xlines (
   type varchar(20) NOT NULL,
   mask varchar(255) NOT NULL,
   xby text NOT NULL,