cvs commit: jahia/src/java/org/jahia/data/fields JahiaPageField.java

[Serge Huber]

shuber      2004/09/23 18:55:29 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/data/fields JahiaPageField.java 
  Log:
  Added login and logout engine in list of engines that should not see protected pages 
that are linked to.
  
  Revision  Changes    Path
  1.41.2.2  +11 -4     jahia/src/java/org/jahia/data/fields/JahiaPageField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/fields/JahiaPageField.java.diff?r1=1.41.2.1&r2=1.41.2.2&f=h
  
  
  
  Index: JahiaPageField.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/data/fields/Attic/JahiaPageField.java,v
  retrieving revision 1.41.2.1
  retrieving revision 1.41.2.2
  diff -u -r1.41.2.1 -r1.41.2.2
  --- JahiaPageField.java       9 Sep 2004 10:18:00 -0000       1.41.2.1
  +++ JahiaPageField.java       23 Sep 2004 16:55:29 -0000      1.41.2.2
  @@ -26,6 +26,8 @@
   import org.jahia.services.pages.JahiaPageDefinition;
   import org.jahia.services.sites.JahiaSite;
   import org.jahia.utils.JahiaConsole;
  +import org.jahia.engines.login.Login_Engine;
  +import org.jahia.engines.logout.Logout_Engine;
   
   public class JahiaPageField extends JahiaField
   {
  @@ -202,10 +204,15 @@
                                       }
                                   }
                               } else {
  -                                if ((jParams != null) && 
(jParams.getEngine().equals(ParamBean.CORE_ENGINE_NAME))) {
  -                                    this.setObject (null);
  -                                    if 
(this.getValue().toUpperCase().indexOf("JAHIA_LINKONLY") == -1) {
  -                                        this.setValue ("");
  +                                if (jParams != null) {
  +                                    if 
(jParams.getEngine().equals(ParamBean.CORE_ENGINE_NAME) ||
  +                                        
jParams.getEngine().equals(Login_Engine.ENGINE_NAME) ||
  +                                        
jParams.getEngine().equals(Logout_Engine.ENGINE_NAME)) {
  +                                        this.setObject(null);
  +                                        if (this.getValue().toUpperCase().
  +                                            indexOf("JAHIA_LINKONLY") == -1) {
  +                                            this.setValue("");
  +                                        }
                                       }
                                   }
                               }