Mir goes GPL

[mir.git] / source / mircoders / entity / EntityContent.java

diff --git a/source/mircoders/entity/EntityContent.java b/source/mircoders/entity/EntityContent.java
index 01a9d1f..b45dd3b 100755 (executable)
--- a/source/mircoders/entity/EntityContent.java
+++ b/source/mircoders/entity/EntityContent.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mircoders.entity;
 
 import java.lang.*;
@@ -19,10 +50,16 @@ import mircoders.storage.*;
  * this class implements mapping of one line of the database table content
  * to a java object
  *
- * @version $Revision: 1.8 $ $Date: 2002/06/28 20:37:33 $
+ * @version $Revision: 1.9.2.1 $ $Date: 2002/09/01 21:31:43 $
  * @author $Author: mh $
  *
  * $Log: EntityContent.java,v $
+ * Revision 1.9.2.1  2002/09/01 21:31:43  mh
+ * Mir goes GPL
+ *
+ * Revision 1.9  2002/07/19 20:55:49  mh
+ * commented out decodeHTML, as we don't encodeHTML anymore
+ *
  * Revision 1.8  2002/06/28 20:37:33  mh
  * make date_formatted be webdb_create_short instead to be more consistent. also make date2webdb.. use webdb_create
  *
@@ -274,7 +311,7 @@ public class EntityContent extends Entity
 
   private String getContentDataParsed() {
     String returnField = getValue("content_data");
-    if (returnField!=null & returnField.length()>0 ) {
+    if ((returnField!=null) && (returnField.length()>0) ) {
       returnField=StringUtil.deleteForbiddenTags(returnField);
       //create http-links and email-links
       if (getValue("is_html").equals("0")) {
@@ -282,7 +319,9 @@ public class EntityContent extends Entity
                                             mirconf_mailLinkName,mirconf_extLinkName,
                                             mirconf_intLinkName);
       }
-      returnField = StringUtil.decodeHTMLinTags(returnField);
+      // commented this out as I don't think it necessary as we don't
+      // "encodeHTML" in the first place anymore.. -mh 2002.07.19
+      //returnField = StringUtil.decodeHTMLinTags(returnField);
     }
     return returnField;
   }