[Openfirst-cvscommit] emoticon/setup setup.mssql,1.3,1.4 setup.mysql,1.11,1.12

[<xt...@us...>]

Update of /cvsroot/openfirst/emoticon/setup
In directory sc8-pr-cvs1:/tmp/cvs-serv18661

Modified Files:
	setup.mssql setup.mysql 
Log Message:
Fix problem which was allowing emoticons to build up in a constant loop if the emoticon module had been installed multiple times

Index: setup.mssql
===================================================================
RCS file: /cvsroot/openfirst/emoticon/setup/setup.mssql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.mssql	1 Sep 2003 18:50:52 -0000	1.3
--- setup.mssql	23 Nov 2003 23:19:54 -0000	1.4
***************
*** 1,2 ****
--- 1,3 ----
+ DROP TABLE ofirst_emoticon;
  CREATE TABLE ofirst_emoticon (ID tinyint(3) unsigned NOT NULL auto_increment, emoticon text, substitution text, PRIMARY KEY  (ID)) TYPE=MyISAM;
  ALTER TABLE ofirst_emoticon MODIFY ID int(5) unsigned NOT NULL auto_increment;
***************
*** 442,446 ****
  INSERT INTO ofirst_emoticon (emoticon, substitution) VALUES ('(torch)','<img src=\"http://openfirst.sourceforge.net/image/minimascot.png\" alt=\"(torch)\" title=\"(torch)\" />');
  INSERT INTO ofirst_emoticon (emoticon, substitution) VALUES ('(first)','<img src=\"http://openfirst.sourceforge.net/image/icon/flag/first.png\" alt=\"(first)\" title=\"(first)\" />');
! INSERT INTO ofirst_config SET modulename='emoticon',showonmenu='0',active='0',adminnavigation='<a href="$basepath/emoticon/">Main</a>',includes='emoticonf.php',modulenavigation='<a href="$basepath/emoticon/">View Emoticons</a>';
  INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('motherfucker','************');
  INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('fuck','****');
--- 443,447 ----
  INSERT INTO ofirst_emoticon (emoticon, substitution) VALUES ('(torch)','<img src=\"http://openfirst.sourceforge.net/image/minimascot.png\" alt=\"(torch)\" title=\"(torch)\" />');
  INSERT INTO ofirst_emoticon (emoticon, substitution) VALUES ('(first)','<img src=\"http://openfirst.sourceforge.net/image/icon/flag/first.png\" alt=\"(first)\" title=\"(first)\" />');
! INSERT INTO ofirst_config SET modulename='emoticon',showonmenu='0',active='0',includes='emoticonf.php',modulenavigation='<a href="$basepath/emoticon/">View Emoticons</a>';
  INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('motherfucker','************');
  INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('fuck','****');
***************
*** 448,449 ****
--- 449,453 ----
  INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('pussy','*****');
  INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('ass','***');
+ INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('cunt','****');
+ INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('dick','****');
+ INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('bitch,'*****');

Index: setup.mysql
===================================================================
RCS file: /cvsroot/openfirst/emoticon/setup/setup.mysql,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** setup.mysql	13 Sep 2003 15:36:53 -0000	1.11
--- setup.mysql	23 Nov 2003 23:19:54 -0000	1.12
***************
*** 1,2 ****
--- 1,3 ----
+ DROP TABLE ofirst_emoticon;
  CREATE TABLE ofirst_emoticon (ID tinyint(3) unsigned NOT NULL auto_increment, emoticon text, substitution text, PRIMARY KEY  (ID)) TYPE=MyISAM;
  ALTER TABLE ofirst_emoticon MODIFY ID int(5) unsigned NOT NULL auto_increment;
***************
*** 450,452 ****
  INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('cunt','****');
  INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('dick','****');
! INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('bitch,'*****');
\ No newline at end of file
--- 451,453 ----
  INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('cunt','****');
  INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('dick','****');
! INSERT INTO ofirst_slurblock (slur, substitution) VALUES ('bitch,'*****');