From f0879c1272c3d301354db3ca4413b2988e317893 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Mon, 19 Dec 2005 03:35:58 +0000
Subject: [PATCH] r622: Dropping the username markup stuff

---
 admin/usergroup.php     | 7 +------
 docs/schema_changes.sql | 6 +++++-
 includes/init.php       | 2 --
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/admin/usergroup.php b/admin/usergroup.php
index edb4658..9e6be2c 100755
--- a/admin/usergroup.php
+++ b/admin/usergroup.php
@@ -127,8 +127,6 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
 	$admin->table_head($lang->string('Usergroup Details'));
 	$admin->row_input($lang->string('Usergroup Title'), 'title', $bugsys->sanitize($usergroup['title']));
 	$admin->row_input($lang->string('Display Title<div><dfn>This is the title that others will be able to see when comments are posted.</dfn></div>'), 'displaytitle', $bugsys->sanitize($usergroup['displaytitle']));
-	$admin->row_input($lang->string('Opening Tag Markup<div><dfn>Place all open HTML tags here that will be wrapped around the username.</dfn></div>'), 'opentag', $bugsys->sanitize($usergroup['opentag']));
-	$admin->row_input($lang->string('Closing Tag Markup<div><dfn>Place all closed HTML tags that will close any open HTML tags entered above.</dfn></div>'), 'closetag', $bugsys->sanitize($usergroup['closetag']));
 	$admin->table_end();
 	
 	// Permission
@@ -193,10 +191,9 @@ if ($_POST['do'] == 'insert')
 	
 	$db->query("
 		INSERT INTO " . TABLE_PREFIX . "usergroup
-			(title, displaytitle, opentag, closetag, permissions)
+			(title, displaytitle, permissions)
 		VALUES
 			('" . $bugsys->in['title'] . "', '" . $bugsys->in['displaytitle'] . "',
-			'" . $bugsys->in['opentag'] . "', '" . $bugsys->in['closetag'] . "',
 			$permissionvalue
 		)"
 	);
@@ -234,8 +231,6 @@ if ($_POST['do'] == 'update')
 		UPDATE " . TABLE_PREFIX . "usergroup
 		SET title = '" . $bugsys->in['title'] . "',
 			displaytitle = '" . $bugsys->in['displaytitle'] . "',
-			opentag = '" . $bugsys->unsanitize($bugsys->in['opentag']) . "',
-			closetag = '" . $bugsys->unsanitize($bugsys->in['closetag']) . "',
 			permissions = $permissionvalue
 		WHERE usergroupid = " . intval($bugsys->in['usergroupid'])
 	);
diff --git a/docs/schema_changes.sql b/docs/schema_changes.sql
index 5f9319a..87971c3 100644
--- a/docs/schema_changes.sql
+++ b/docs/schema_changes.sql
@@ -1,3 +1,7 @@
 ## SVN $Id$
 
-ALTER TABLE `product` DROP `shortname`;
\ No newline at end of file
+ALTER TABLE `product` DROP `shortname`;
+
+ALTER TABLE `usergroup` DROP `opentag`;
+
+ALTER TABLE `usergroup` DROP `closetag`;
\ No newline at end of file
diff --git a/includes/init.php b/includes/init.php
index 2b3cc92..de5cf10 100755
--- a/includes/init.php
+++ b/includes/init.php
@@ -93,7 +93,6 @@ if ($userid)
     	$userinfo['permissions'] = (int)$bugsys->datastore['usergroup']["$userinfo[usergroupid]"]['permissions'];
     	$userinfo['displaytitle'] = $bugsys->datastore['usergroup']["$userinfo[usergroupid]"]['displaytitle'];
     	fetch_user_display_name($userinfo);
-    	$userinfo['mdisplayname'] = $bugsys->datastore['usergroup']["$userinfo[usergroupid]"]['opentag'] . $userinfo['displayname'] . $bugsys->datastore['usergroup']["$userinfo[usergroupid]"]['closetag'];
     	$bugsys->userinfo = $userinfo;
     	$funct->cookie(COOKIE_PREFIX . 'userid', $bugsys->userinfo['userid']);
     	$funct->cookie(COOKIE_PREFIX . 'authkey', $bugsys->userinfo['authkey']);
@@ -112,7 +111,6 @@ if (!$userinfo)
 		'showcolours' => 1,
 		'permissions' => $bugsys->datastore['usergroup'][1]['permissions'],
 		'displaytitle' => $bugsys->datastore['usergroup'][1]['displaytitle'],
-		'mdisplayname' => $bugsys->datastore['usergroup'][1]['opentag'] . '' . $bugsys->datastore['usergroup'][1]['closetag']
 	);
 }
 
-- 
2.22.5