diff --git a/modules/websubmit/web/approve.py b/modules/websubmit/web/approve.py
index 76b5c06db..6344788ba 100644
--- a/modules/websubmit/web/approve.py
+++ b/modules/websubmit/web/approve.py
@@ -1,83 +1,84 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
    
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import acc_isRole
 from cdsware.websubmit_config import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, page_not_authorized
 from cdsware.messages import *
 from mod_python import apache
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang):
 
     uid = getUid(req)
-    if uid == -1: 
+    if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
         return page_not_authorized(req, "../approve.py/index")
 
     ln = wash_language(ln)
     form = req.form
     if form.keys():
         access = form.keys()[0]
         if access == "":
             return errorMsg("approve.py: cannot determine document reference",req)
         res = run_sql("select doctype,rn from sbmAPPROVAL where access=%s",(access,))
         if len(res) == 0:
             return errorMsg("approve.py: cannot find document in database",req)
         else:
             doctype = res[0][0]
             rn = res[0][1]
         res = run_sql("select value from sbmPARAMETERS where name='edsrn' and doctype=%s",(doctype,))
         edsrn = res[0][0]
         url = "%s/sub.py?%s=%s&password=%s@APP%s" % (urlpath,edsrn,rn,access,doctype)
         req.err_headers_out.add("Location", url)
         raise apache.SERVER_RETURN, apache.HTTP_MOVED_PERMANENTLY
         return ""
     else:
         return errorMsg("Sorry parameter missing...", req, c, ln)
 
 def errorMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="error",
                     body = create_error_box(req, title=title,verbose=0, ln=ln),
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 
 </protect>
diff --git a/modules/websubmit/web/approve.py.wml b/modules/websubmit/web/approve.py.wml
index 76b5c06db..6344788ba 100644
--- a/modules/websubmit/web/approve.py.wml
+++ b/modules/websubmit/web/approve.py.wml
@@ -1,83 +1,84 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
    
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import acc_isRole
 from cdsware.websubmit_config import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, page_not_authorized
 from cdsware.messages import *
 from mod_python import apache
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang):
 
     uid = getUid(req)
-    if uid == -1: 
+    if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
         return page_not_authorized(req, "../approve.py/index")
 
     ln = wash_language(ln)
     form = req.form
     if form.keys():
         access = form.keys()[0]
         if access == "":
             return errorMsg("approve.py: cannot determine document reference",req)
         res = run_sql("select doctype,rn from sbmAPPROVAL where access=%s",(access,))
         if len(res) == 0:
             return errorMsg("approve.py: cannot find document in database",req)
         else:
             doctype = res[0][0]
             rn = res[0][1]
         res = run_sql("select value from sbmPARAMETERS where name='edsrn' and doctype=%s",(doctype,))
         edsrn = res[0][0]
         url = "%s/sub.py?%s=%s&password=%s@APP%s" % (urlpath,edsrn,rn,access,doctype)
         req.err_headers_out.add("Location", url)
         raise apache.SERVER_RETURN, apache.HTTP_MOVED_PERMANENTLY
         return ""
     else:
         return errorMsg("Sorry parameter missing...", req, c, ln)
 
 def errorMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="error",
                     body = create_error_box(req, title=title,verbose=0, ln=ln),
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 
 </protect>
diff --git a/modules/websubmit/web/direct.py b/modules/websubmit/web/direct.py
index 0272d44bb..5510fe28a 100644
--- a/modules/websubmit/web/direct.py
+++ b/modules/websubmit/web/direct.py
@@ -1,96 +1,97 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:import string
 import os
 import sys
 import time
 import types
 import re
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import acc_isRole
 from cdsware.websubmit_config import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, page_not_authorized
 from cdsware.messages import *
 from mod_python import apache
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang,sub=""):
 
     uid = getUid(req)
-    if uid == -1: 
+    if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
         return page_not_authorized(req, "../direct.py/index")
 
     myQuery = req.args
     if sub == "":
         return errorMsg("Sorry parameter missing...",req)
     res = run_sql("select docname,actname from sbmIMPLEMENT where subname=%s", (sub,))
     if len(res)==0:
         return errorMsg("Sorry. Can't analyse parameter",req)
     else:
         # get document type
         doctype = res[0][0]
         # get action name
         action = res[0][1]
     # retrieve other parameter values
     params = re.sub("sub=[^&]*","",myQuery)
     # find existing access number
     result = re.search("access=([^&]*)",params)
     if result != None:
         access = result.group(1)
         params = re.sub("access=[^&]*","",params)
     else:
         # create 'unique' access number
         pid = os.getpid()
         now = time.time()
         access = "%i_%s" % (now,pid)
     # retrieve 'dir' value
     res = run_sql ("select dir from sbmACTION where sactname=%s",(action,))
     dir = res[0][0]
     try:
         mainmenu = req.headers_in['Referer']
     except:
         mainmenu = ""
     url = "submit.py?doctype=%s&dir=%s&access=%s&act=%s&startPg=1%s&mainmenu=%s" % (doctype,dir,access,action,params,mainmenu)
     req.err_headers_out.add("Location", url)
     raise apache.SERVER_RETURN, apache.HTTP_MOVED_PERMANENTLY
     return ""
 
 </protect>
 
 def errorMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="error",
                     body = create_error_box(req, title=title,verbose=0, ln=ln),
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
diff --git a/modules/websubmit/web/direct.py.wml b/modules/websubmit/web/direct.py.wml
index 0272d44bb..5510fe28a 100644
--- a/modules/websubmit/web/direct.py.wml
+++ b/modules/websubmit/web/direct.py.wml
@@ -1,96 +1,97 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:import string
 import os
 import sys
 import time
 import types
 import re
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import acc_isRole
 from cdsware.websubmit_config import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, page_not_authorized
 from cdsware.messages import *
 from mod_python import apache
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang,sub=""):
 
     uid = getUid(req)
-    if uid == -1: 
+    if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
         return page_not_authorized(req, "../direct.py/index")
 
     myQuery = req.args
     if sub == "":
         return errorMsg("Sorry parameter missing...",req)
     res = run_sql("select docname,actname from sbmIMPLEMENT where subname=%s", (sub,))
     if len(res)==0:
         return errorMsg("Sorry. Can't analyse parameter",req)
     else:
         # get document type
         doctype = res[0][0]
         # get action name
         action = res[0][1]
     # retrieve other parameter values
     params = re.sub("sub=[^&]*","",myQuery)
     # find existing access number
     result = re.search("access=([^&]*)",params)
     if result != None:
         access = result.group(1)
         params = re.sub("access=[^&]*","",params)
     else:
         # create 'unique' access number
         pid = os.getpid()
         now = time.time()
         access = "%i_%s" % (now,pid)
     # retrieve 'dir' value
     res = run_sql ("select dir from sbmACTION where sactname=%s",(action,))
     dir = res[0][0]
     try:
         mainmenu = req.headers_in['Referer']
     except:
         mainmenu = ""
     url = "submit.py?doctype=%s&dir=%s&access=%s&act=%s&startPg=1%s&mainmenu=%s" % (doctype,dir,access,action,params,mainmenu)
     req.err_headers_out.add("Location", url)
     raise apache.SERVER_RETURN, apache.HTTP_MOVED_PERMANENTLY
     return ""
 
 </protect>
 
 def errorMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="error",
                     body = create_error_box(req, title=title,verbose=0, ln=ln),
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
diff --git a/modules/websubmit/web/getfile.py b/modules/websubmit/web/getfile.py
index 75ecd0412..3e93efce7 100644
--- a/modules/websubmit/web/getfile.py
+++ b/modules/websubmit/web/getfile.py
@@ -1,115 +1,116 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import acc_isRole
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, page_not_authorized
 from cdsware.messages import *
 from mod_python import apache
 from cdsware.websubmit_config import *
 from cdsware.file import *
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang,recid="",docid="",version="",name="",format=""):
     # get user ID:
     try:
         uid = getUid(req)
-        if uid == -1: 
+        if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
             return page_not_authorized(req, "../getfile.py/index")
         uid_email = get_email(uid)
     except MySQLdb.Error, e:
         return errorMsg(e.value,req)
     docfiles = []
     t=""
     filelist=""
     # if a precise file is requested, we stream it
     if name!="":
         if docid=="":
             return errorMsg("Parameter docid missing",req)
         else:
             docfile = BibDoc(bibdocid=docid).getFile(name,format,version)
             if docfile == None:
                 return warningMsg("can't find file...",req)
             else:
                 return docfile.stream(req)
     # all files attached to a record
     elif recid!="":
         bibarchive = BibRecDocs(recid)
         filelist = bibarchive.display(docid,version)
     # a precise filename
     elif docid!="":
         bibdoc = BibDoc(bibdocid=docid)
         recid = bibdoc.getRecid()
         filelist = bibdoc.display(version)
     title = "record #<a href=\"search.py?recid=%s\">%s</a>" % (recid,recid)
     if docid != "":
         title += " document #%s" % docid
     if version != "":
         title += " version #%s" % version
     t = """<center><table class="searchbox" summary="" width="500"><tr><th class="portalboxheader">Access&nbsp;to&nbsp;Fulltext&nbsp;&nbsp;&nbsp;&nbsp;<font size=-2>[%s]</font></th></tr><tr><td class="portalboxbody"><!--start file list-->\n""" % title
     t+=filelist
     t+="""<!--end file list--></td></tr></table></center>\n"""
     p_navtrail = "Access to Fulltext"
     return page(title="",
                      body=t,
                      navtrail = p_navtrail,
                      description="",
                      keywords="keywords",
                      uid=uid,
                      language=ln,
                      urlargs=req.args
                      )
    
 def errorMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="error",
                     body = create_error_box(req, title=title,verbose=0, ln=ln),
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 
 def warningMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="warning",
                     body = title,
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 
 </protect>
diff --git a/modules/websubmit/web/getfile.py.wml b/modules/websubmit/web/getfile.py.wml
index 75ecd0412..3e93efce7 100644
--- a/modules/websubmit/web/getfile.py.wml
+++ b/modules/websubmit/web/getfile.py.wml
@@ -1,115 +1,116 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import acc_isRole
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, page_not_authorized
 from cdsware.messages import *
 from mod_python import apache
 from cdsware.websubmit_config import *
 from cdsware.file import *
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang,recid="",docid="",version="",name="",format=""):
     # get user ID:
     try:
         uid = getUid(req)
-        if uid == -1: 
+        if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
             return page_not_authorized(req, "../getfile.py/index")
         uid_email = get_email(uid)
     except MySQLdb.Error, e:
         return errorMsg(e.value,req)
     docfiles = []
     t=""
     filelist=""
     # if a precise file is requested, we stream it
     if name!="":
         if docid=="":
             return errorMsg("Parameter docid missing",req)
         else:
             docfile = BibDoc(bibdocid=docid).getFile(name,format,version)
             if docfile == None:
                 return warningMsg("can't find file...",req)
             else:
                 return docfile.stream(req)
     # all files attached to a record
     elif recid!="":
         bibarchive = BibRecDocs(recid)
         filelist = bibarchive.display(docid,version)
     # a precise filename
     elif docid!="":
         bibdoc = BibDoc(bibdocid=docid)
         recid = bibdoc.getRecid()
         filelist = bibdoc.display(version)
     title = "record #<a href=\"search.py?recid=%s\">%s</a>" % (recid,recid)
     if docid != "":
         title += " document #%s" % docid
     if version != "":
         title += " version #%s" % version
     t = """<center><table class="searchbox" summary="" width="500"><tr><th class="portalboxheader">Access&nbsp;to&nbsp;Fulltext&nbsp;&nbsp;&nbsp;&nbsp;<font size=-2>[%s]</font></th></tr><tr><td class="portalboxbody"><!--start file list-->\n""" % title
     t+=filelist
     t+="""<!--end file list--></td></tr></table></center>\n"""
     p_navtrail = "Access to Fulltext"
     return page(title="",
                      body=t,
                      navtrail = p_navtrail,
                      description="",
                      keywords="keywords",
                      uid=uid,
                      language=ln,
                      urlargs=req.args
                      )
    
 def errorMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="error",
                     body = create_error_box(req, title=title,verbose=0, ln=ln),
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 
 def warningMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="warning",
                     body = title,
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 
 </protect>
diff --git a/modules/websubmit/web/publiline.py b/modules/websubmit/web/publiline.py
index 4bf22988b..65f2551cf 100644
--- a/modules/websubmit/web/publiline.py
+++ b/modules/websubmit/web/publiline.py
@@ -1,432 +1,433 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 import MySQLdb
 import shutil
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang,supportemail
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, list_registered_users, page_not_authorized
 from cdsware.messages import *
 from cdsware.websubmit_config import *
 from cdsware.search_engine import search_pattern
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 execfile("%s/cdsware/websubmit_functions/Retrieve_Data.py" % pylibdir)
 execfile("%s/cdsware/websubmit_functions/mail.py" % pylibdir)
 
 def index(req,c=cdsname,ln=cdslang,doctype="",categ="",RN="",send=""):
     global uid
     ln = wash_language(ln)
     t=""
     # get user ID:
     try:
         uid = getUid(req)
-        if uid == -1: 
+        if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
             return page_not_authorized(req, "../publiline.py/index")
         uid_email = get_email(uid)
     except MySQLdb.Error, e:
         return errorMsg(e.value,req)
     if doctype == "":
         t=selectDoctype()
     elif categ == "":
         t=selectCateg(doctype)
     elif RN == "":
         t=selectDocument(doctype,categ)
     else:
         t=displayDocument(doctype,categ,RN,send)
     return page(title="publication line",
                     body=t,
                     description="",
                     keywords="",
                     uid=uid,
                     language=ln,
                     urlargs=req.args)
                     
 def selectDoctype():
     t="""
  <table class="searchbox" width="100%" summary="">
     <tr>
         <th class="portalboxheader">List of refereed types of documents</th>
     </tr>
     <tr>
         <td class="portalboxbody">
     Select one of the following types of documents to check the documents status:</small>
     <blockquote>"""
     res = run_sql("select DISTINCT doctype from sbmAPPROVAL")
     for row in res:
         res2 = run_sql("select ldocname from sbmDOCTYPE where sdocname=%s", (row[0],))
         t+="<li><A HREF='publiline.py?doctype=%s'>%s</A><BR>" % (row[0],res2[0][0])
     t+="""</blockquote>
         </td>
     </tr>
 </table>"""
     return t
 
 def selectCateg(doctype):
     t=""
     res = run_sql("select ldocname from sbmDOCTYPE where sdocname=%s",(doctype,))
     title = res[0][0]
     sth = run_sql("select * from sbmCATEGORIES where doctype=%s order by lname",(doctype,))
     if len(sth) == 0:
         categ = "unknown"
         return selectDocument(doctype,categ)
     t+="""
  <table class="searchbox" width="100%" summary="">
     <tr>"""
     t+=   "<th class=\"portalboxheader\">%s: List of refereed categories</th>" % title
     t+="""
     </tr>
     <tr>
         <td class="portalboxbody">
         Please choose a category
     <blockquote>
         <FORM action="publiline.py" method=get>"""
     t+="        <INPUT type=hidden name=doctype value='%s'>\n" % doctype
     t+="        <INPUT type=hidden name=categ value=''>\n"
     t+="        </FORM>\n"
     t+="""
 <TABLE>
 <TR>
     <TD align=left>"""
     for arr in sth:
         waiting = 0
         rejected = 0
         approved = 0
         sth2 = run_sql("select COUNT(*) from sbmAPPROVAL where doctype=%s and categ=%s and status='waiting'", (doctype,arr[1],))
         waiting = sth2[0][0]
         sth2 = run_sql("select COUNT(*) from sbmAPPROVAL where doctype=%s and categ=%s and status='approved'",(doctype,arr[1],))
         approved = sth2[0][0]
         sth2 = run_sql("select COUNT(*) from sbmAPPROVAL where doctype=%s and categ=%s and status='rejected'",(doctype,arr[1],))
         rejected = sth2[0][0]
         num = waiting + approved + rejected
         if waiting != 0: 
             classtext = "class=blocknote"
         else:
             classtext = ""
         t+="<A href=\"\" onClick=\"document.forms[0].categ.value='%s';document.forms[0].submit();return false;\"><SMALL %s>%s</SMALL></A><SMALL> (%s document<SMALL>(</SMALL>s<SMALL>)</SMALL>\n" % (arr[1],classtext,arr[2],num)
         if waiting != 0:
             t+= "| %s<IMG ALT=\"pending\" SRC=\"%s/waiting_or.gif\" border=0>\n" % (waiting,images)
         if approved != 0:
             t+= "| %s<IMG ALT=\"approved\" SRC=\"%s/smchk_gr.gif\" border=0>\n" % (approved,images)
         if rejected != 0:
             t+= "| %s<IMG ALT=\"rejected\" SRC=\"%s/cross_red.gif\" border=0>" % (rejected,images)
         t+=")</SMALL><BR>\n"
     t+="""
     </TD>
     <TD>
          <table class="searchbox" width="100%" summary="">
             <tr>
                 <th class="portalboxheader">Key:</th>
             <tr>
             <tr>
                 <td>"""
     t+="        <IMG ALT=\"pending\" SRC=\"%s/waiting_or.gif\" border=0> waiting for approval<BR>" % images
     t+="        <IMG ALT=\"approved\" SRC=\"%s/smchk_gr.gif\" border=0> already approved<BR>" % images
     t+="        <IMG ALT=\"rejected\" SRC=\"%s/cross_red.gif\" border=0> rejected<BR><BR>\n" % images
     t+="""
                 <SMALL class=blocknote>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SMALL> some documents are pending<BR></SMALL>
                 </td>
             </tr>
         </table>
     </TD>
 </TR>
 </TABLE>
         </blockquote>
         </td>
     </tr>
 </table>"""
     return t
 
 def selectDocument(doctype,categ):
     t=""
     res = run_sql("select ldocname from sbmDOCTYPE where sdocname=%s", (doctype,))
     title = res[0][0]
     if categ == "":
         categ == "unknown"
     t+="""
  <table class="searchbox" width="100%" summary="">
     <tr>"""
     t+=   "<th class=\"portalboxheader\">%s - %s: List of refereed documents</th>" % (title,categ)
     t+="""
     </tr>
     <tr>
         <td class="portalboxbody">
         Click on a report number to have more information
     <blockquote>
         <FORM action="publiline.py" method=get>"""
     t+="        <INPUT type=hidden name=doctype value='%s'>\n" % doctype
     t+="        <INPUT type=hidden name=categ value='%s'>\n" % categ
     t+="        <INPUT type=hidden name=RN value=''>\n" 
     t+="        </FORM>\n"
     t+="<TABLE class=\"searchbox\">"
     t+="<TR><TH class=\"portalboxheader\">Report  Number</TH><TH class=\"portalboxheader\">Pending</TH><TH class=\"portalboxheader\">Approved</TH><TH class=\"portalboxheader\">Rejected</TH></TR>"
     sth = run_sql("select rn,status from sbmAPPROVAL where doctype=%s and categ=%s order by status DESC,rn DESC",(doctype,categ))
     for arr in sth:
         RN = arr[0]
         status = arr[1]
         if status == "waiting":
             t+= "<TR><TD align=center><A HREF=\"\" onClick=\"document.forms[0].RN.value='%s';document.forms[0].submit();return false;\">%s</A></TD><TD align=center><IMG ALT=\"check\" SRC=\"%s/waiting_or.gif\"></TD><TD align=center>&nbsp;</TD><TD align=center>&nbsp;</TD></TR>" % (RN,RN,images)
         elif status == "rejected":
             t+="<TR><TD align=center><A HREF=\"\" onClick=\"document.forms[0].RN.value='%s';document.forms[0].submit();return false;\">%s</A></TD><TD align=center>&nbsp;</TD><TD align=center>&nbsp;</TD><TD align=center><IMG ALT=\"check\" SRC=\"%s/cross_red.gif\"></TD></TR>" % (RN,RN,images)
         elif status == "approved":
             t+="<TR><TD align=center><A HREF=\"\" onClick=\"document.forms[0].RN.value='%s';document.forms[0].submit();return false;\">%s</A></TD><TD align=center>&nbsp;</TD><TD align=center><IMG ALT=\"check\" SRC=\"%s/smchk_gr.gif\"></TD><TD align=center>&nbsp;</TD></TR>" % (RN,RN,images)
     t+= """</TABLE>
         </blockquote>
         </td>
     </tr>
 </table>"""
     return t
 
 def displayDocument(doctype,categ,RN,send):
     t=""
     res = run_sql("select ldocname from sbmDOCTYPE where sdocname=%s", (doctype,))
     docname = res[0][0]
     if categ == "":
         categ = "unknown"
     sth = run_sql("select rn,status,dFirstReq,dLastReq,dAction,access from sbmAPPROVAL where rn=%s",(RN,))
     if len(sth) > 0:
         arr = sth[0]
         status = arr[1]
         dFirstReq = arr[2]
         dLastReq = arr[3]
         dAction = arr[4]
         access = arr[5]
         if status == "waiting":
             image = "<IMG SRC=\"%s/waiting_or.gif\" ALT=\"\" align=right>" % images
         elif status == "approved":
             image = "<IMG SRC=\"%s/smchk_gr.gif\" ALT=\"\" align=right>" % images
         elif status == "rejected":
             image = "<IMG SRC=\"%s/iconcross.gif\" ALT=\"\" align=right>" % images
         else:
             image = ""
         t+="""
  <table class="searchbox" summary="">
     <tr>"""
         t+=   "<th class=\"portalboxheader\">%s%s</th>" % (image,RN)
         t+="""
     </tr>
     <tr>
         <td class="portalboxbody">"""
     else:
         return warningMsg("This document has never been requested for approval!<BR>&nbsp;")
     (authors,title,sysno,newrn) = getInfo(doctype,categ,RN)
     if send == "Send Again":
         if authors == "unknown" or title == "unknown":
             SendWarning(doctype,categ,RN,title,authors,access)
         else:
             SendEnglish(doctype,categ,RN,title,authors,access,sysno)
             run_sql("update sbmAPPROVAL set dLastReq=NOW() where rn=%s",(RN,))
             t+= "<I><strong class=headline>Your request has been sent to the referee!</strong></I><BR><BR>"
     t+= "<FORM action=\"publiline.py\">\n"
     t+= "<INPUT type=hidden name=RN value=\"%s\">\n" % RN
     t+= "<INPUT type=hidden name=categ value=\"%s\">\n" % categ
     t+= "<INPUT type=hidden name=doctype value=\"%s\">\n" % doctype
     t+="<SMALL>\n"
     if title != "unknown":
         t+= "<strong class=headline>Title:</strong>%s<BR><BR>\n" % title
     if authors != "":
         t+="<strong class=headline>Author:</strong>%s<BR><BR>\n" % authors
     if sysno != "":
         t+="<strong class=headline>More information:</strong>"
         t+= " <A HREF=\"%s?id=%s\">click here</A><BR><BR>\n" % (accessurl,sysno)
     if status == "waiting":
         t+= "This Document is still <strong class=headline>waiting for approval</strong>.<BR><BR>"
         t+="It has first been sent to approval on: <strong class=headline>%s</strong><BR>" % dFirstReq
         if dLastReq == "0000-00-00 00:00:00":
             t+= "Last approval e-mail was sent on: <strong class=headline>%s</strong><BR>" % dFirstReq
         else:
             t+= "Last approval e-mail was sent on: <strong class=headline>%s</strong><BR>" % dLastReq
         t+="<BR>You can send an approval request e-mail again by clicking the following button:"
         t+= "<BR><INPUT class=\"adminbutton\" type=submit name=send value=\"Send Again\" onClick=\"return confirm('WARNING! An e-mail will be send to your referee if you confirm.')\">"
         # We also display a button for the referee
         (auth_code, auth_message) = acc_authorize_action(uid, "referee",verbose=0,doctype=doctype, categ=categ)
         if auth_code == 0:
             t+= "<br>As a referee for this document, you may click this button to approve or reject it:"
             t+= "<BR><INPUT class=\"adminbutton\" type=submit name=approval value=\"Approve/Reject\" onClick=\"window.location='approve.py?%s';return false;\">" % access
     if status == "approved":
         t+="This Document has been <strong class=headline>approved</strong>.<BR>Its approved reference is: <strong class=headline>%s</strong><BR><BR>" % newrn
         t+="It has first been sent to approval on: <strong class=headline>%s</strong><BR>" % dFirstReq
         if dLastReq == "0000-00-00 00:00:00":
             t+= "Last approval e-mail was sent on: <strong class=headline>%s</STRONG><BR>" % dFirstReq
         else:
             t+= "Last approval e-mail was sent on: <strong class=headline>%s</STRONG><BR>" % dLastReq
             t+="It has been approved on: <strong class=headline>%s</STRONG><BR>" % dAction
     if status == "rejected":
         t+= "This Document has been <strong class=headline>rejected</STRONG>.<BR><BR>"
         t+="It has first been sent to approval on: <strong class=headline>%s</STRONG><BR>" % dFirstReq
         if dLastReq == "0000-00-00 00:00:00":
             t+= "Last approval e-mail was sent on: <strong class=headline>%s</STRONG><BR>" % dFirstReq
         else:
             t+="Last approval e-mail was sent on: <strong class=headline>%s</STRONG><BR>" % dLastReq
         t+= "It has been rejected on: <strong class=headline>%s</STRONG><BR>" % dAction
     t+= "</SMALL></FORM>"
     t+= """<BR></TD></TR></TABLE>
         </blockquote>
         </td>
     </tr>
 </table>"""
     return t
 
 # Retrieve info about document
 def getInfo(doctype,categ,RN):
     result = getInPending(doctype,categ,RN)
     if not result:
         result = getInAlice(doctype,categ,RN)
     return result
 
 #seek info in pending directory
 def getInPending(doctype,categ,RN):
     PENDIR="%s/pending" % storage
     if os.path.exists("%s/%s/%s/AU" % (PENDIR,doctype,RN)):
         fp = open("%s/%s/%s/AU" % (PENDIR,doctype,RN),"r")
         authors=fp.read()
         fp.close()
     else:
         authors = ""
     if os.path.exists("%s/%s/%s/TI" % (PENDIR,doctype,RN)):
         fp = open("%s/%s/%s/TI" % (PENDIR,doctype,RN),"r")
         title=fp.read()
         fp.close()
     else:
         title = ""
     if os.path.exists("%s/%s/%s/SN" % (PENDIR,doctype,RN)):
         fp = open("%s/%s/%s/SN" % (PENDIR,doctype,RN),"r")
         sysno=fp.read()
         fp.close()
     else:
         sysno = ""
     if title == "" and os.path.exists("%s/%s/%s/TIF" % (PENDIR,doctype,RN)):
         fp = open("%s/%s/%s/TIF" % (PENDIR,doctype,RN),"r")
         title=fp.read()
         fp.close()
     if title == "":
         return 0
     else:
         return (authors,title,sysno,"")
 
 #seek info in Alice database
 def getInAlice(doctype,categ,RN):
     # initialize sysno variable
     sysno = ""
     searchresults = search_pattern(req=None, p=RN, f="reportnumber").items().tolist()
     if len(searchresults) == 0:
         return 0
     sysno = searchresults[0]
     if sysno != "":
         title = Get_Field('245__a',sysno)
         emailvalue = Get_Field('8560_f',sysno)
         authors = Get_Field('100__a',sysno)
         authors += "\n%s" % Get_Field('700__a',sysno)
         newrn = Get_Field('037__a',sysno)
         return (authors,title,sysno,newrn)
     else:
         return 0
 
 def SendEnglish(doctype,categ,RN,title,authors,access,sysno):
     FROMADDR = '%s Submission Engine <%s>' % (cdsname,supportemail)
     # retrieve useful information from webSubmit configuration
     res = run_sql("select value from sbmPARAMETERS where name='categformatDAM' and doctype=%s", (doctype,))
     categformat = res[0][0]
     categformat = re.sub("<CATEG>","([^-]*)",categformat)
     categs = re.match(categformat,RN)
     if categs != None:
         categ = categs.group(1)
     else:
         categ = "unknown"
     res = run_sql("select value from sbmPARAMETERS where name='addressesDAM' and doctype=%s",(doctype,))
     if len(res) > 0:
         otheraddresses = res[0][0]
         otheraddresses = otheraddresses.replace("<CATEG>",categ)
     else:
         otheraddresses = ""
     # Build referee's email address
     refereeaddress = ""
     # Try to retrieve the referee's email from the referee's database
     for user in acc_getRoleUsers(acc_getRoleId("referee_%s_%s" % (doctype,categ))):
         refereeaddress += user[1] + ","
     # And if there are general referees
     for user in acc_getRoleUsers(acc_getRoleId("referee_%s_*" % doctype)):
         refereeaddress += user[1] + ","
     refereeaddress = re.sub(",$","",refereeaddress)
     # Creation of the mail for the referee
     addresses = ""
     if refereeaddress != "":
         addresses = refereeaddress + ","
     if otheraddresses != "":
         addresses += otheraddresses
     else:
         addresses = re.sub(",$","",addresses)
     if addresses=="":
         SendWarning(doctype,categ,RN,title,authors,access)
         return 0
     if authors == "":
         authors = "-"
     res = run_sql("select value from sbmPARAMETERS where name='directory' and doctype=%s", (doctype,))
     directory = res[0][0]
     message = """
     The document %s has been published as a Communication.
     Your approval is requested for it to become an official Note.
     
     Title: %s
     
     Author(s): %s
     
     To access the document(s), select the file(s) from the location:
     <%s/getfile.py?recid=%s>
     
     To approve/reject the document, you should go to this URL:
     <%s/approve.py?%s>
     
     ---------------------------------------------
     Best regards.
     The submission team.""" % (RN,title,authors,urlpath,sysno,urlpath,access)
     # send the mail
     body = forge_email(FROMADDR,addresses,adminemail,"Request for Approval of %s" % RN,message)
     send_email(FROMADDR,addresses,body,0)
     return ""
 
 def SendWarning(doctype,categ,RN,title,authors,access):
     FROMADDR = '%s Submission Engine <%s>' % (cdsname,supportemail)
     message = "Failed sending approval email request for %s" % RN
     # send the mail
     body = forge_email(FROMADDR,adminemail,"","Failed sending approval email request",message)
     send_email(FROMADDR,adminemail,body,0)
     return ""
 </protect>
diff --git a/modules/websubmit/web/publiline.py.wml b/modules/websubmit/web/publiline.py.wml
index 4bf22988b..65f2551cf 100644
--- a/modules/websubmit/web/publiline.py.wml
+++ b/modules/websubmit/web/publiline.py.wml
@@ -1,432 +1,433 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 import MySQLdb
 import shutil
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang,supportemail
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, list_registered_users, page_not_authorized
 from cdsware.messages import *
 from cdsware.websubmit_config import *
 from cdsware.search_engine import search_pattern
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 execfile("%s/cdsware/websubmit_functions/Retrieve_Data.py" % pylibdir)
 execfile("%s/cdsware/websubmit_functions/mail.py" % pylibdir)
 
 def index(req,c=cdsname,ln=cdslang,doctype="",categ="",RN="",send=""):
     global uid
     ln = wash_language(ln)
     t=""
     # get user ID:
     try:
         uid = getUid(req)
-        if uid == -1: 
+        if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
             return page_not_authorized(req, "../publiline.py/index")
         uid_email = get_email(uid)
     except MySQLdb.Error, e:
         return errorMsg(e.value,req)
     if doctype == "":
         t=selectDoctype()
     elif categ == "":
         t=selectCateg(doctype)
     elif RN == "":
         t=selectDocument(doctype,categ)
     else:
         t=displayDocument(doctype,categ,RN,send)
     return page(title="publication line",
                     body=t,
                     description="",
                     keywords="",
                     uid=uid,
                     language=ln,
                     urlargs=req.args)
                     
 def selectDoctype():
     t="""
  <table class="searchbox" width="100%" summary="">
     <tr>
         <th class="portalboxheader">List of refereed types of documents</th>
     </tr>
     <tr>
         <td class="portalboxbody">
     Select one of the following types of documents to check the documents status:</small>
     <blockquote>"""
     res = run_sql("select DISTINCT doctype from sbmAPPROVAL")
     for row in res:
         res2 = run_sql("select ldocname from sbmDOCTYPE where sdocname=%s", (row[0],))
         t+="<li><A HREF='publiline.py?doctype=%s'>%s</A><BR>" % (row[0],res2[0][0])
     t+="""</blockquote>
         </td>
     </tr>
 </table>"""
     return t
 
 def selectCateg(doctype):
     t=""
     res = run_sql("select ldocname from sbmDOCTYPE where sdocname=%s",(doctype,))
     title = res[0][0]
     sth = run_sql("select * from sbmCATEGORIES where doctype=%s order by lname",(doctype,))
     if len(sth) == 0:
         categ = "unknown"
         return selectDocument(doctype,categ)
     t+="""
  <table class="searchbox" width="100%" summary="">
     <tr>"""
     t+=   "<th class=\"portalboxheader\">%s: List of refereed categories</th>" % title
     t+="""
     </tr>
     <tr>
         <td class="portalboxbody">
         Please choose a category
     <blockquote>
         <FORM action="publiline.py" method=get>"""
     t+="        <INPUT type=hidden name=doctype value='%s'>\n" % doctype
     t+="        <INPUT type=hidden name=categ value=''>\n"
     t+="        </FORM>\n"
     t+="""
 <TABLE>
 <TR>
     <TD align=left>"""
     for arr in sth:
         waiting = 0
         rejected = 0
         approved = 0
         sth2 = run_sql("select COUNT(*) from sbmAPPROVAL where doctype=%s and categ=%s and status='waiting'", (doctype,arr[1],))
         waiting = sth2[0][0]
         sth2 = run_sql("select COUNT(*) from sbmAPPROVAL where doctype=%s and categ=%s and status='approved'",(doctype,arr[1],))
         approved = sth2[0][0]
         sth2 = run_sql("select COUNT(*) from sbmAPPROVAL where doctype=%s and categ=%s and status='rejected'",(doctype,arr[1],))
         rejected = sth2[0][0]
         num = waiting + approved + rejected
         if waiting != 0: 
             classtext = "class=blocknote"
         else:
             classtext = ""
         t+="<A href=\"\" onClick=\"document.forms[0].categ.value='%s';document.forms[0].submit();return false;\"><SMALL %s>%s</SMALL></A><SMALL> (%s document<SMALL>(</SMALL>s<SMALL>)</SMALL>\n" % (arr[1],classtext,arr[2],num)
         if waiting != 0:
             t+= "| %s<IMG ALT=\"pending\" SRC=\"%s/waiting_or.gif\" border=0>\n" % (waiting,images)
         if approved != 0:
             t+= "| %s<IMG ALT=\"approved\" SRC=\"%s/smchk_gr.gif\" border=0>\n" % (approved,images)
         if rejected != 0:
             t+= "| %s<IMG ALT=\"rejected\" SRC=\"%s/cross_red.gif\" border=0>" % (rejected,images)
         t+=")</SMALL><BR>\n"
     t+="""
     </TD>
     <TD>
          <table class="searchbox" width="100%" summary="">
             <tr>
                 <th class="portalboxheader">Key:</th>
             <tr>
             <tr>
                 <td>"""
     t+="        <IMG ALT=\"pending\" SRC=\"%s/waiting_or.gif\" border=0> waiting for approval<BR>" % images
     t+="        <IMG ALT=\"approved\" SRC=\"%s/smchk_gr.gif\" border=0> already approved<BR>" % images
     t+="        <IMG ALT=\"rejected\" SRC=\"%s/cross_red.gif\" border=0> rejected<BR><BR>\n" % images
     t+="""
                 <SMALL class=blocknote>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SMALL> some documents are pending<BR></SMALL>
                 </td>
             </tr>
         </table>
     </TD>
 </TR>
 </TABLE>
         </blockquote>
         </td>
     </tr>
 </table>"""
     return t
 
 def selectDocument(doctype,categ):
     t=""
     res = run_sql("select ldocname from sbmDOCTYPE where sdocname=%s", (doctype,))
     title = res[0][0]
     if categ == "":
         categ == "unknown"
     t+="""
  <table class="searchbox" width="100%" summary="">
     <tr>"""
     t+=   "<th class=\"portalboxheader\">%s - %s: List of refereed documents</th>" % (title,categ)
     t+="""
     </tr>
     <tr>
         <td class="portalboxbody">
         Click on a report number to have more information
     <blockquote>
         <FORM action="publiline.py" method=get>"""
     t+="        <INPUT type=hidden name=doctype value='%s'>\n" % doctype
     t+="        <INPUT type=hidden name=categ value='%s'>\n" % categ
     t+="        <INPUT type=hidden name=RN value=''>\n" 
     t+="        </FORM>\n"
     t+="<TABLE class=\"searchbox\">"
     t+="<TR><TH class=\"portalboxheader\">Report  Number</TH><TH class=\"portalboxheader\">Pending</TH><TH class=\"portalboxheader\">Approved</TH><TH class=\"portalboxheader\">Rejected</TH></TR>"
     sth = run_sql("select rn,status from sbmAPPROVAL where doctype=%s and categ=%s order by status DESC,rn DESC",(doctype,categ))
     for arr in sth:
         RN = arr[0]
         status = arr[1]
         if status == "waiting":
             t+= "<TR><TD align=center><A HREF=\"\" onClick=\"document.forms[0].RN.value='%s';document.forms[0].submit();return false;\">%s</A></TD><TD align=center><IMG ALT=\"check\" SRC=\"%s/waiting_or.gif\"></TD><TD align=center>&nbsp;</TD><TD align=center>&nbsp;</TD></TR>" % (RN,RN,images)
         elif status == "rejected":
             t+="<TR><TD align=center><A HREF=\"\" onClick=\"document.forms[0].RN.value='%s';document.forms[0].submit();return false;\">%s</A></TD><TD align=center>&nbsp;</TD><TD align=center>&nbsp;</TD><TD align=center><IMG ALT=\"check\" SRC=\"%s/cross_red.gif\"></TD></TR>" % (RN,RN,images)
         elif status == "approved":
             t+="<TR><TD align=center><A HREF=\"\" onClick=\"document.forms[0].RN.value='%s';document.forms[0].submit();return false;\">%s</A></TD><TD align=center>&nbsp;</TD><TD align=center><IMG ALT=\"check\" SRC=\"%s/smchk_gr.gif\"></TD><TD align=center>&nbsp;</TD></TR>" % (RN,RN,images)
     t+= """</TABLE>
         </blockquote>
         </td>
     </tr>
 </table>"""
     return t
 
 def displayDocument(doctype,categ,RN,send):
     t=""
     res = run_sql("select ldocname from sbmDOCTYPE where sdocname=%s", (doctype,))
     docname = res[0][0]
     if categ == "":
         categ = "unknown"
     sth = run_sql("select rn,status,dFirstReq,dLastReq,dAction,access from sbmAPPROVAL where rn=%s",(RN,))
     if len(sth) > 0:
         arr = sth[0]
         status = arr[1]
         dFirstReq = arr[2]
         dLastReq = arr[3]
         dAction = arr[4]
         access = arr[5]
         if status == "waiting":
             image = "<IMG SRC=\"%s/waiting_or.gif\" ALT=\"\" align=right>" % images
         elif status == "approved":
             image = "<IMG SRC=\"%s/smchk_gr.gif\" ALT=\"\" align=right>" % images
         elif status == "rejected":
             image = "<IMG SRC=\"%s/iconcross.gif\" ALT=\"\" align=right>" % images
         else:
             image = ""
         t+="""
  <table class="searchbox" summary="">
     <tr>"""
         t+=   "<th class=\"portalboxheader\">%s%s</th>" % (image,RN)
         t+="""
     </tr>
     <tr>
         <td class="portalboxbody">"""
     else:
         return warningMsg("This document has never been requested for approval!<BR>&nbsp;")
     (authors,title,sysno,newrn) = getInfo(doctype,categ,RN)
     if send == "Send Again":
         if authors == "unknown" or title == "unknown":
             SendWarning(doctype,categ,RN,title,authors,access)
         else:
             SendEnglish(doctype,categ,RN,title,authors,access,sysno)
             run_sql("update sbmAPPROVAL set dLastReq=NOW() where rn=%s",(RN,))
             t+= "<I><strong class=headline>Your request has been sent to the referee!</strong></I><BR><BR>"
     t+= "<FORM action=\"publiline.py\">\n"
     t+= "<INPUT type=hidden name=RN value=\"%s\">\n" % RN
     t+= "<INPUT type=hidden name=categ value=\"%s\">\n" % categ
     t+= "<INPUT type=hidden name=doctype value=\"%s\">\n" % doctype
     t+="<SMALL>\n"
     if title != "unknown":
         t+= "<strong class=headline>Title:</strong>%s<BR><BR>\n" % title
     if authors != "":
         t+="<strong class=headline>Author:</strong>%s<BR><BR>\n" % authors
     if sysno != "":
         t+="<strong class=headline>More information:</strong>"
         t+= " <A HREF=\"%s?id=%s\">click here</A><BR><BR>\n" % (accessurl,sysno)
     if status == "waiting":
         t+= "This Document is still <strong class=headline>waiting for approval</strong>.<BR><BR>"
         t+="It has first been sent to approval on: <strong class=headline>%s</strong><BR>" % dFirstReq
         if dLastReq == "0000-00-00 00:00:00":
             t+= "Last approval e-mail was sent on: <strong class=headline>%s</strong><BR>" % dFirstReq
         else:
             t+= "Last approval e-mail was sent on: <strong class=headline>%s</strong><BR>" % dLastReq
         t+="<BR>You can send an approval request e-mail again by clicking the following button:"
         t+= "<BR><INPUT class=\"adminbutton\" type=submit name=send value=\"Send Again\" onClick=\"return confirm('WARNING! An e-mail will be send to your referee if you confirm.')\">"
         # We also display a button for the referee
         (auth_code, auth_message) = acc_authorize_action(uid, "referee",verbose=0,doctype=doctype, categ=categ)
         if auth_code == 0:
             t+= "<br>As a referee for this document, you may click this button to approve or reject it:"
             t+= "<BR><INPUT class=\"adminbutton\" type=submit name=approval value=\"Approve/Reject\" onClick=\"window.location='approve.py?%s';return false;\">" % access
     if status == "approved":
         t+="This Document has been <strong class=headline>approved</strong>.<BR>Its approved reference is: <strong class=headline>%s</strong><BR><BR>" % newrn
         t+="It has first been sent to approval on: <strong class=headline>%s</strong><BR>" % dFirstReq
         if dLastReq == "0000-00-00 00:00:00":
             t+= "Last approval e-mail was sent on: <strong class=headline>%s</STRONG><BR>" % dFirstReq
         else:
             t+= "Last approval e-mail was sent on: <strong class=headline>%s</STRONG><BR>" % dLastReq
             t+="It has been approved on: <strong class=headline>%s</STRONG><BR>" % dAction
     if status == "rejected":
         t+= "This Document has been <strong class=headline>rejected</STRONG>.<BR><BR>"
         t+="It has first been sent to approval on: <strong class=headline>%s</STRONG><BR>" % dFirstReq
         if dLastReq == "0000-00-00 00:00:00":
             t+= "Last approval e-mail was sent on: <strong class=headline>%s</STRONG><BR>" % dFirstReq
         else:
             t+="Last approval e-mail was sent on: <strong class=headline>%s</STRONG><BR>" % dLastReq
         t+= "It has been rejected on: <strong class=headline>%s</STRONG><BR>" % dAction
     t+= "</SMALL></FORM>"
     t+= """<BR></TD></TR></TABLE>
         </blockquote>
         </td>
     </tr>
 </table>"""
     return t
 
 # Retrieve info about document
 def getInfo(doctype,categ,RN):
     result = getInPending(doctype,categ,RN)
     if not result:
         result = getInAlice(doctype,categ,RN)
     return result
 
 #seek info in pending directory
 def getInPending(doctype,categ,RN):
     PENDIR="%s/pending" % storage
     if os.path.exists("%s/%s/%s/AU" % (PENDIR,doctype,RN)):
         fp = open("%s/%s/%s/AU" % (PENDIR,doctype,RN),"r")
         authors=fp.read()
         fp.close()
     else:
         authors = ""
     if os.path.exists("%s/%s/%s/TI" % (PENDIR,doctype,RN)):
         fp = open("%s/%s/%s/TI" % (PENDIR,doctype,RN),"r")
         title=fp.read()
         fp.close()
     else:
         title = ""
     if os.path.exists("%s/%s/%s/SN" % (PENDIR,doctype,RN)):
         fp = open("%s/%s/%s/SN" % (PENDIR,doctype,RN),"r")
         sysno=fp.read()
         fp.close()
     else:
         sysno = ""
     if title == "" and os.path.exists("%s/%s/%s/TIF" % (PENDIR,doctype,RN)):
         fp = open("%s/%s/%s/TIF" % (PENDIR,doctype,RN),"r")
         title=fp.read()
         fp.close()
     if title == "":
         return 0
     else:
         return (authors,title,sysno,"")
 
 #seek info in Alice database
 def getInAlice(doctype,categ,RN):
     # initialize sysno variable
     sysno = ""
     searchresults = search_pattern(req=None, p=RN, f="reportnumber").items().tolist()
     if len(searchresults) == 0:
         return 0
     sysno = searchresults[0]
     if sysno != "":
         title = Get_Field('245__a',sysno)
         emailvalue = Get_Field('8560_f',sysno)
         authors = Get_Field('100__a',sysno)
         authors += "\n%s" % Get_Field('700__a',sysno)
         newrn = Get_Field('037__a',sysno)
         return (authors,title,sysno,newrn)
     else:
         return 0
 
 def SendEnglish(doctype,categ,RN,title,authors,access,sysno):
     FROMADDR = '%s Submission Engine <%s>' % (cdsname,supportemail)
     # retrieve useful information from webSubmit configuration
     res = run_sql("select value from sbmPARAMETERS where name='categformatDAM' and doctype=%s", (doctype,))
     categformat = res[0][0]
     categformat = re.sub("<CATEG>","([^-]*)",categformat)
     categs = re.match(categformat,RN)
     if categs != None:
         categ = categs.group(1)
     else:
         categ = "unknown"
     res = run_sql("select value from sbmPARAMETERS where name='addressesDAM' and doctype=%s",(doctype,))
     if len(res) > 0:
         otheraddresses = res[0][0]
         otheraddresses = otheraddresses.replace("<CATEG>",categ)
     else:
         otheraddresses = ""
     # Build referee's email address
     refereeaddress = ""
     # Try to retrieve the referee's email from the referee's database
     for user in acc_getRoleUsers(acc_getRoleId("referee_%s_%s" % (doctype,categ))):
         refereeaddress += user[1] + ","
     # And if there are general referees
     for user in acc_getRoleUsers(acc_getRoleId("referee_%s_*" % doctype)):
         refereeaddress += user[1] + ","
     refereeaddress = re.sub(",$","",refereeaddress)
     # Creation of the mail for the referee
     addresses = ""
     if refereeaddress != "":
         addresses = refereeaddress + ","
     if otheraddresses != "":
         addresses += otheraddresses
     else:
         addresses = re.sub(",$","",addresses)
     if addresses=="":
         SendWarning(doctype,categ,RN,title,authors,access)
         return 0
     if authors == "":
         authors = "-"
     res = run_sql("select value from sbmPARAMETERS where name='directory' and doctype=%s", (doctype,))
     directory = res[0][0]
     message = """
     The document %s has been published as a Communication.
     Your approval is requested for it to become an official Note.
     
     Title: %s
     
     Author(s): %s
     
     To access the document(s), select the file(s) from the location:
     <%s/getfile.py?recid=%s>
     
     To approve/reject the document, you should go to this URL:
     <%s/approve.py?%s>
     
     ---------------------------------------------
     Best regards.
     The submission team.""" % (RN,title,authors,urlpath,sysno,urlpath,access)
     # send the mail
     body = forge_email(FROMADDR,addresses,adminemail,"Request for Approval of %s" % RN,message)
     send_email(FROMADDR,addresses,body,0)
     return ""
 
 def SendWarning(doctype,categ,RN,title,authors,access):
     FROMADDR = '%s Submission Engine <%s>' % (cdsname,supportemail)
     message = "Failed sending approval email request for %s" % RN
     # send the mail
     body = forge_email(FROMADDR,adminemail,"","Failed sending approval email request",message)
     send_email(FROMADDR,adminemail,body,0)
     return ""
 </protect>
diff --git a/modules/websubmit/web/sub.py b/modules/websubmit/web/sub.py
index 043391535..46d523115 100644
--- a/modules/websubmit/web/sub.py
+++ b/modules/websubmit/web/sub.py
@@ -1,65 +1,66 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import acc_isRole
 from cdsware.websubmit_config import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, page_not_authorized
 from cdsware.messages import *
 from mod_python import apache
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang):
     uid = getUid(req)
-    if uid == -1: 
+    if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
         return page_not_authorized(req, "../sub.py/index")
 
     myQuery = req.args
     if myQuery:
         if re.search("@",myQuery):
             param = re.sub("@.*","",myQuery)
             IN = re.sub(".*@","",myQuery)
         else:
             IN = myQuery
         url = "%s/direct.py?sub=%s&%s" % (urlpath,IN,param)
         req.err_headers_out.add("Location", url)
         raise apache.SERVER_RETURN, apache.HTTP_MOVED_PERMANENTLY
         return ""
     else:
         return "<html>Illegal page access</html>"
 </protect>
diff --git a/modules/websubmit/web/sub.py.wml b/modules/websubmit/web/sub.py.wml
index 043391535..46d523115 100644
--- a/modules/websubmit/web/sub.py.wml
+++ b/modules/websubmit/web/sub.py.wml
@@ -1,65 +1,66 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import acc_isRole
 from cdsware.websubmit_config import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, page_not_authorized
 from cdsware.messages import *
 from mod_python import apache
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang):
     uid = getUid(req)
-    if uid == -1: 
+    if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
         return page_not_authorized(req, "../sub.py/index")
 
     myQuery = req.args
     if myQuery:
         if re.search("@",myQuery):
             param = re.sub("@.*","",myQuery)
             IN = re.sub(".*@","",myQuery)
         else:
             IN = myQuery
         url = "%s/direct.py?sub=%s&%s" % (urlpath,IN,param)
         req.err_headers_out.add("Location", url)
         raise apache.SERVER_RETURN, apache.HTTP_MOVED_PERMANENTLY
         return ""
     else:
         return "<html>Illegal page access</html>"
 </protect>
diff --git a/modules/websubmit/web/submit.py b/modules/websubmit/web/submit.py
index eee400769..845eb3bc6 100644
--- a/modules/websubmit/web/submit.py
+++ b/modules/websubmit/web/submit.py
@@ -1,63 +1,64 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import acc_isRole
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, page_not_authorized
 from cdsware.messages import *
 from mod_python import apache
 from cdsware.websubmit_config import *
 from cdsware.websubmit_engine import *
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang, doctype="", act="", startPg=1, indir="", access="",mainmenu="",fromdir="",file="",nextPg="",nbPg="",curpage=1,step=0,mode="U"):
 
     uid = getUid(req)
-    if uid == -1: 
+    if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
         return page_not_authorized(req, "../submit.py/index")
 
     if doctype=="":
         return home(req,c,ln)
     elif act=="":
         return action(req,c,ln,doctype)
     elif int(step)==0:
         return interface(req,c,ln, doctype, act, startPg, indir, access,mainmenu,fromdir,file,nextPg,nbPg,curpage)
     else:
         return endaction(req,c,ln, doctype, act, startPg, indir, access,mainmenu,fromdir,file,nextPg,nbPg,curpage,step,mode)
         
 </protect>
diff --git a/modules/websubmit/web/submit.py.wml b/modules/websubmit/web/submit.py.wml
index eee400769..845eb3bc6 100644
--- a/modules/websubmit/web/submit.py.wml
+++ b/modules/websubmit/web/submit.py.wml
@@ -1,63 +1,64 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import acc_isRole
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, page_not_authorized
 from cdsware.messages import *
 from mod_python import apache
 from cdsware.websubmit_config import *
 from cdsware.websubmit_engine import *
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang, doctype="", act="", startPg=1, indir="", access="",mainmenu="",fromdir="",file="",nextPg="",nbPg="",curpage=1,step=0,mode="U"):
 
     uid = getUid(req)
-    if uid == -1: 
+    if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
         return page_not_authorized(req, "../submit.py/index")
 
     if doctype=="":
         return home(req,c,ln)
     elif act=="":
         return action(req,c,ln,doctype)
     elif int(step)==0:
         return interface(req,c,ln, doctype, act, startPg, indir, access,mainmenu,fromdir,file,nextPg,nbPg,curpage)
     else:
         return endaction(req,c,ln, doctype, act, startPg, indir, access,mainmenu,fromdir,file,nextPg,nbPg,curpage,step,mode)
         
 </protect>
diff --git a/modules/websubmit/web/summary.py b/modules/websubmit/web/summary.py
index a204cfb26..307b897b7 100644
--- a/modules/websubmit/web/summary.py
+++ b/modules/websubmit/web/summary.py
@@ -1,77 +1,78 @@
 ## $Id$
 ## CDSware WebSubmit in mod_python.
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 ## start Python:
 <protect>## $Id$</protect>
 <protect>## DO NOT EDIT THIS FILE! IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.</protect>
 """CDSware Submission Web Interface."""
 
 ## fill config variables:
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.websubmit_config import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid,get_email, page_not_authorized
 from cdsware.messages import *
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,doctype="",act="",access="",indir=""):
     uid = getUid(req)
-    if uid == -1: 
+    if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
         return page_not_authorized(req, "../summary.py/index")
 
     t=""    
     curdir = "%s/%s/%s/%s" % (storage,indir,doctype,access)
     subname = "%s%s" % (act,doctype)
     res = run_sql("select sdesc,fidesc,pagenb,level from sbmFIELD where subname=%s order by pagenb,fieldnb", (subname,))
     nbFields = 0
     t=t+"<body style=\"background-image: url(%s/header_background.gif);\"><table border=0>\n" % images
     for arr in res:
         if arr[0] != "":
             if arr[3] == "M":
                 color = "red"
             else:
                 color = ""
             if os.path.exists("%s/%s" % (curdir,arr[1])):
                 fd = open("%s/%s" % (curdir,arr[1]),"r")
                 value = fd.read()
                 fd.close()
                 value = value.replace("\n"," ")
                 value = value.replace("Select:","")
             else:
                 value = ""
             #value = strip_tags($value);
             t=t+ "<tr><td align=right><small><A HREF='' onClick=\"window.opener.document.forms[0].curpage.value='%s';window.opener.document.forms[0].action='submit.py';window.opener.document.forms[0].submit();return false;\"><FONT color=\"%s\">%s</FONT></A></small></td><td><I><small><font color=black>%s</font></small></I></td></tr>\n" % (arr[2],color,arr[0],value);
     t=t+"</table>"
     return t
 </protect>
diff --git a/modules/websubmit/web/summary.py.wml b/modules/websubmit/web/summary.py.wml
index a204cfb26..307b897b7 100644
--- a/modules/websubmit/web/summary.py.wml
+++ b/modules/websubmit/web/summary.py.wml
@@ -1,77 +1,78 @@
 ## $Id$
 ## CDSware WebSubmit in mod_python.
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 ## start Python:
 <protect>## $Id$</protect>
 <protect>## DO NOT EDIT THIS FILE! IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.</protect>
 """CDSware Submission Web Interface."""
 
 ## fill config variables:
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 
 sys.path.append('%s' % pylibdir)
 from cdsware.config import cdsname,cdslang
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.websubmit_config import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid,get_email, page_not_authorized
 from cdsware.messages import *
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,doctype="",act="",access="",indir=""):
     uid = getUid(req)
-    if uid == -1: 
+    if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
         return page_not_authorized(req, "../summary.py/index")
 
     t=""    
     curdir = "%s/%s/%s/%s" % (storage,indir,doctype,access)
     subname = "%s%s" % (act,doctype)
     res = run_sql("select sdesc,fidesc,pagenb,level from sbmFIELD where subname=%s order by pagenb,fieldnb", (subname,))
     nbFields = 0
     t=t+"<body style=\"background-image: url(%s/header_background.gif);\"><table border=0>\n" % images
     for arr in res:
         if arr[0] != "":
             if arr[3] == "M":
                 color = "red"
             else:
                 color = ""
             if os.path.exists("%s/%s" % (curdir,arr[1])):
                 fd = open("%s/%s" % (curdir,arr[1]),"r")
                 value = fd.read()
                 fd.close()
                 value = value.replace("\n"," ")
                 value = value.replace("Select:","")
             else:
                 value = ""
             #value = strip_tags($value);
             t=t+ "<tr><td align=right><small><A HREF='' onClick=\"window.opener.document.forms[0].curpage.value='%s';window.opener.document.forms[0].action='submit.py';window.opener.document.forms[0].submit();return false;\"><FONT color=\"%s\">%s</FONT></A></small></td><td><I><small><font color=black>%s</font></small></I></td></tr>\n" % (arr[2],color,arr[0],value);
     t=t+"</table>"
     return t
 </protect>
diff --git a/modules/websubmit/web/yourapprovals.py b/modules/websubmit/web/yourapprovals.py
index be0d8ae11..a1fdc051f 100644
--- a/modules/websubmit/web/yourapprovals.py
+++ b/modules/websubmit/web/yourapprovals.py
@@ -1,105 +1,106 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import os
 import sys
 sys.path.append('%s' % pylibdir)
 from cdsware.config import weburl,cdsname,cdslang
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, list_registered_users, page_not_authorized
 from cdsware.messages import *
 from cdsware.websubmit_config import *
 from cdsware.search_engine import search_pattern
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang,order="",doctype="",deletedId="",deletedAction="",deletedDoctype=""):
     global uid
     ln = wash_language(ln)
     t=""
     # get user ID:
     try:
         uid = getUid(req)
-        if uid == -1: 
+        if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
             return page_not_authorized(req, "../yourapprovals.py/index")
         u_email = get_email(uid)
     except MySQLdb.Error, e:
         return errorMsg(e.value,req)
     t+="""
  <table class="searchbox" width="100%" summary="">
     <tr>
         <th class="portalboxheader">Refereed Documents</th>
     </tr>
     <tr>
     <td class=\"portalboxbody\">"""
     res = run_sql("select sdocname,ldocname from sbmDOCTYPE")
     for row in res:
         doctype = row[0]
         docname = row[1]
         reftext = ""
         if isReferee(uid,doctype,"*"):
             reftext+= "<LI><A HREF=\"publiline.py?doctype=%s\">You are general referee</a><br>" % doctype
             res2 = run_sql("select sname,lname from sbmCATEGORIES where doctype=%s",(doctype,))
             for row2 in res2:
                 category = row2[0]
                 categname = row2[1]
                 if isReferee(uid,doctype,category):
                     reftext+= "<LI><A HREF=\"publiline.py?doctype=%s&categ=%s\">You are referee for category: %s (%s)</a><br>" % (doctype,category,categname,category)
         if reftext != "":
             t+= "<UL><LI><b>%s</b><UL><small>" % docname
             t+=reftext
             t+="</small></UL></UL>"
     t+="</td></tr></table>"
     return page(title="Your Approvals",
                 navtrail="""<a class="navtrail" href="%s/youraccount.py/display">Your Account</a>""" % weburl,
                 body=t,
                 description="",
                 keywords="",
                 uid=uid,
                 language=ln,
                 urlargs=req.args)
 
 def isReferee(uid,doctype="",categ=""):
     (auth_code, auth_message) = acc_authorize_action(uid, "referee",verbose=0,doctype=doctype, categ=categ)
     if auth_code == 0:
         return 1
     else:
         return 0
 
 def errorMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="error",
                     body = create_error_box(req, title=title,verbose=0, ln=ln),
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 </protect>
diff --git a/modules/websubmit/web/yourapprovals.py.wml b/modules/websubmit/web/yourapprovals.py.wml
index be0d8ae11..a1fdc051f 100644
--- a/modules/websubmit/web/yourapprovals.py.wml
+++ b/modules/websubmit/web/yourapprovals.py.wml
@@ -1,105 +1,106 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import os
 import sys
 sys.path.append('%s' % pylibdir)
 from cdsware.config import weburl,cdsname,cdslang
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, list_registered_users, page_not_authorized
 from cdsware.messages import *
 from cdsware.websubmit_config import *
 from cdsware.search_engine import search_pattern
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang,order="",doctype="",deletedId="",deletedAction="",deletedDoctype=""):
     global uid
     ln = wash_language(ln)
     t=""
     # get user ID:
     try:
         uid = getUid(req)
-        if uid == -1: 
+        if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
             return page_not_authorized(req, "../yourapprovals.py/index")
         u_email = get_email(uid)
     except MySQLdb.Error, e:
         return errorMsg(e.value,req)
     t+="""
  <table class="searchbox" width="100%" summary="">
     <tr>
         <th class="portalboxheader">Refereed Documents</th>
     </tr>
     <tr>
     <td class=\"portalboxbody\">"""
     res = run_sql("select sdocname,ldocname from sbmDOCTYPE")
     for row in res:
         doctype = row[0]
         docname = row[1]
         reftext = ""
         if isReferee(uid,doctype,"*"):
             reftext+= "<LI><A HREF=\"publiline.py?doctype=%s\">You are general referee</a><br>" % doctype
             res2 = run_sql("select sname,lname from sbmCATEGORIES where doctype=%s",(doctype,))
             for row2 in res2:
                 category = row2[0]
                 categname = row2[1]
                 if isReferee(uid,doctype,category):
                     reftext+= "<LI><A HREF=\"publiline.py?doctype=%s&categ=%s\">You are referee for category: %s (%s)</a><br>" % (doctype,category,categname,category)
         if reftext != "":
             t+= "<UL><LI><b>%s</b><UL><small>" % docname
             t+=reftext
             t+="</small></UL></UL>"
     t+="</td></tr></table>"
     return page(title="Your Approvals",
                 navtrail="""<a class="navtrail" href="%s/youraccount.py/display">Your Account</a>""" % weburl,
                 body=t,
                 description="",
                 keywords="",
                 uid=uid,
                 language=ln,
                 urlargs=req.args)
 
 def isReferee(uid,doctype="",categ=""):
     (auth_code, auth_message) = acc_authorize_action(uid, "referee",verbose=0,doctype=doctype, categ=categ)
     if auth_code == 0:
         return 1
     else:
         return 0
 
 def errorMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="error",
                     body = create_error_box(req, title=title,verbose=0, ln=ln),
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 </protect>
diff --git a/modules/websubmit/web/yoursubmissions.py b/modules/websubmit/web/yoursubmissions.py
index 5fa291c76..a70292c5e 100644
--- a/modules/websubmit/web/yoursubmissions.py
+++ b/modules/websubmit/web/yoursubmissions.py
@@ -1,214 +1,215 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 import MySQLdb
 import shutil
 import operator
 sys.path.append('%s' % pylibdir)
 from cdsware.config import weburl,cdsname,cdslang
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, list_registered_users, page_not_authorized
 from cdsware.messages import *
 from cdsware.websubmit_config import *
 from cdsware.search_engine import search_pattern
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang,order="",doctype="",deletedId="",deletedAction="",deletedDoctype=""):
     global uid
     ln = wash_language(ln)
     t=""
     # get user ID:
     try:
         uid = getUid(req)
-        if uid == -1: 
+        if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
             return page_not_authorized(req, "../yoursubmissions.py/index")
         u_email = get_email(uid)
     except MySQLdb.Error, e:
         return errorMsg(e.value,req)
     if deletedId != "":
         t+=deleteSubmission(deletedId,deletedAction,deletedDoctype,u_email)
     t+="""
 <BR>
 <SMALL>
 <form>
 <input type=hidden value='%s' name=order>""" % order
     t+="""
 <input type=hidden name=deletedId>
 <input type=hidden name=deletedDoctype>
 <input type=hidden name=deletedAction>
  <table class="searchbox" width="100%" summary="">
     <tr>
         <th class="portalboxheader">For&nbsp;"""
     t+="<select name=doctype onchange=\"document.forms[0].submit();\"><option value=\"\">all types of document"
     res = run_sql("select ldocname,sdocname from sbmDOCTYPE order by ldocname")
     for row in res:
         if doctype==row[1]:
             t+="<option value=%s selected>%s" % (row[1],row[0])
         else:
             t+="<option value=%s>%s" % (row[1],row[0])
     t+="</th></tr><tr><td class=\"portalboxbody\">\n"
     t+="<table><tr><td></td></tr>"
     # request order default value
     reqorder = "sbmSUBMISSIONS.md DESC, lactname"
     # requested value
     if order == "actiondown":
         reqorder = "lactname ASC, sbmSUBMISSIONS.md DESC"
     elif order == "actionup":
         reqorder = "lactname DESC, sbmSUBMISSIONS.md DESC"
     elif order == "refdown":
         reqorder = "reference ASC, sbmSUBMISSIONS.md DESC, lactname DESC"
     elif order == "refup":
         reqorder = "reference DESC, sbmSUBMISSIONS.md DESC, lactname DESC"
     elif order == "cddown":
         reqorder = "sbmSUBMISSIONS.cd DESC, lactname"
     elif order == "cdup":
         reqorder = "sbmSUBMISSIONS.cd ASC, lactname"
     elif order == "mddown":
         reqorder = "sbmSUBMISSIONS.md DESC, lactname"
     elif order == "mdup":
         reqorder = "sbmSUBMISSIONS.md ASC, lactname"
     elif order == "statusdown":
         reqorder = "sbmSUBMISSIONS.status DESC, lactname"
     elif order == "statusup":
         reqorder = "sbmSUBMISSIONS.status ASC, lactname"
     if doctype != "":
         docselect = " and doctype='%s' " % doctype
     else:
         docselect = ""
     if u_email == "guest" or u_email == "":
         return warningMsg("<font color=red size=+1>You first have to login  before using this feature. Use the left menu to log in.</font>",req)
     else:
         res = run_sql("SELECT sbmSUBMISSIONS.* FROM sbmSUBMISSIONS,sbmACTION WHERE sactname=action and email=%s and id!='' "+docselect+" ORDER BY doctype,"+reqorder,(u_email,))
     currentdoctype = ""
     currentaction = ""
     currentstatus = ""
     num = 0
     for row in res:
         if currentdoctype != row[1]:
             currentdoctype = row[1]
             currentaction = ""
             currentstatus = ""
             res2 = run_sql("SELECT ldocname FROM sbmDOCTYPE WHERE  sdocname=%s",(currentdoctype,))
             ldocname = res2[0][0]
             t+= "</table>\n"
             t+="%s<br>\n" % ldocname
             t+="<table border=\"0\" class=\"searchbox\" align=\"left\" width=\"100%\">\n"
             t+="<tr><th class=headerselected>Action&nbsp;&nbsp;"
             t+="<a href='' onClick='document.forms[0].order.value=\"actiondown\";document.forms[0].submit();return false;'><img src=%s/smalldown.gif border=0></a>&nbsp;" % images
             t+="<a href='' onClick='document.forms[0].order.value=\"actionup\";document.forms[0].submit();return false;'><img src=%s/smallup.gif border=0></a></th>" % images
             t+="\n<th class=headerselected>Status&nbsp;&nbsp;"
             t+="<a href='' onClick='document.forms[0].order.value=\"statusdown\";document.forms[0].submit();return false;'><img src=%s/smalldown.gif border=0></a>&nbsp;" % images
             t+="<a href='' onClick='document.forms[0].order.value=\"statusup\";document.forms[0].submit();return false;'><img src=%s/smallup.gif border=0></a></th>" % images
             t+="\n<th class=headerselected>id</th><th class=headerselected>reference&nbsp;&nbsp;"
             t+="<a href='' onClick='document.forms[0].order.value=\"refdown\";document.forms[0].submit();return false;'><img src=%s/smalldown.gif border=0></a>&nbsp;" % images
             t+="<a href='' onClick='document.forms[0].order.value=\"refup\";document.forms[0].submit();return false;'><img src=%s/smallup.gif border=0></a></th>" % images
             t+="\n<th class=headerselected>first access&nbsp;&nbsp;"
             t+="<a href='' onClick='document.forms[0].order.value=\"cddown\";document.forms[0].submit();return false;'><img src=%s/smalldown.gif border=0></a>&nbsp;" % images
             t+="<a href='' onClick='document.forms[0].order.value=\"cdup\";document.forms[0].submit();return false;'><img src=%s/smallup.gif border=0></a></th>" % images
             t+="\n<th class=headerselected>last access&nbsp;&nbsp;"
             t+="<a href='' onClick='document.forms[0].order.value=\"mddown\";document.forms[0].submit();return false;'><img src=%s/smalldown.gif border=0></a>&nbsp;" % images
             t+="<a href='' onClick='document.forms[0].order.value=\"mdup\";document.forms[0].submit();return false;'><img src=%s/smallup.gif border=0></a></th></tr>\n" % images
         if currentaction != row[2]:
             currentaction = row[2]
             res2 = run_sql("SELECT lactname FROM sbmACTION WHERE  sactname=%s",(currentaction,))
             lactname = res2[0][0]
         else:
             lactname = "\""
         cdate = str(row[6]).replace(" ","&nbsp;")
         mdate= str(row[7]).replace(" ","&nbsp;")
         if currentstatus != row[3]:
             currentstatus = row[3]
             status=row[3]
         else:
             status = "\""
         if row[3] == "pending":
             idtext = "<a href=\"sub.py?access=%s@%s%s\">%s</a>" % (row[4],currentaction,currentdoctype,row[4])
             idtext+= "&nbsp;<a onClick='if (confirm(\"Are you sure you want to delete this submission?\")){document.forms[0].deletedId.value=\"%s\";document.forms[0].deletedDoctype.value=\"%s\";document.forms[0].deletedAction.value=\"%s\";document.forms[0].submit();return true;}else{return false;}' href=''><img src=%s/smallbin.gif border=0 alt='delete submission %s in %s'></a>" % (row[4],currentdoctype,currentaction,images,row[4],ldocname)
         else:
             idtext = row[4]
         if row[5] == "":
             reference = "<font color=red>not yet given</font>"
         else:
             reference = row[5]
         if operator.mod(num,2) == 0:
             t+= "<tr bgcolor=\"#e0e0e0\">\n"
         else:
             t+= "<tr bgcolor=\"#eeeeee\">\n"
         t+="<td align=center class=mycdscell><small>%s</small></td>\n<td align=center class=mycdscell><small>%s</small></td>\n<td class=mycdscell><small>" % (lactname,status)
         t+="%s</small></td>\n<td class=mycdscell><small>&nbsp;%s" % (idtext,reference)
         t+="</small></td>\n<td class=mycdscell><small>%s</small></td>\n<td class=mycdscell><small>" % cdate
         t+="%s</small></td>\n</tr>\n" % mdate
         num+=1
     t+="</table></td></tr></table></form>"
     
     return page(title="Your Submissions",
                 navtrail="""<a class="navtrail" href="%s/youraccount.py/display">Your Account</a>""" % weburl,
                 body=t,
                 description="",
                 keywords="",
                 uid=uid,
                 language=ln,
                 urlargs=req.args)
  
 def deleteSubmission(id, action, doctype, u_email):
     global storage
     run_sql("delete from sbmSUBMISSIONS WHERE doctype=%s and action=%s and email=%s and status='pending' and id=%s",(doctype,action,u_email,id,))
     res = run_sql("select dir from sbmACTION where sactname=%s",(action,))
     dir = res[0][0]
     if re.search("\.\.",doctype) == None and re.search("\.\.",id) == None and id != "":
         if os.path.exists("%s/%s/%s/%s" % (storage,dir,doctype,id)):
             os.rmdir("%s/%s/%s/%s" % (storage,dir,doctype,id))
     return ""
 
 def warningMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="warning",
                     body = title,
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 
 def errorMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="error",
                     body = create_error_box(req, title=title,verbose=0, ln=ln),
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 </protect>
diff --git a/modules/websubmit/web/yoursubmissions.py.wml b/modules/websubmit/web/yoursubmissions.py.wml
index 5fa291c76..a70292c5e 100644
--- a/modules/websubmit/web/yoursubmissions.py.wml
+++ b/modules/websubmit/web/yoursubmissions.py.wml
@@ -1,214 +1,215 @@
 ## $Id$
 
 ## This file is part of the CERN Document Server Software (CDSware).
 ## Copyright (C) 2002 CERN.
 ##
 ## The CDSware 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.
 ##
 ## The CDSware 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 CDSware; if not, write to the Free Software Foundation, Inc.,
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 
 
 ## read config variables:
 #include "config.wml"
 #include "configbis.wml"
 
 pylibdir = "<LIBDIR>/python"
 <protect>
 ## $Id$
 ## DO NOT EDIT THIS FILE!  IT WAS AUTOMATICALLY GENERATED FROM CDSware WML SOURCES.
 
 ## import interesting modules:
 import string
 import os
 import sys
 import time
 import types
 import re
 import MySQLdb
 import shutil
 import operator
 sys.path.append('%s' % pylibdir)
 from cdsware.config import weburl,cdsname,cdslang
 from cdsware.dbquery import run_sql
 from cdsware.access_control_engine import acc_authorize_action
 from cdsware.access_control_admin import *
 from cdsware.webpage import page, create_error_box
 from cdsware.webuser import getUid, get_email, list_registered_users, page_not_authorized
 from cdsware.messages import *
 from cdsware.websubmit_config import *
 from cdsware.search_engine import search_pattern
+from cdsware.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE
 
 def index(req,c=cdsname,ln=cdslang,order="",doctype="",deletedId="",deletedAction="",deletedDoctype=""):
     global uid
     ln = wash_language(ln)
     t=""
     # get user ID:
     try:
         uid = getUid(req)
-        if uid == -1: 
+        if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1:
             return page_not_authorized(req, "../yoursubmissions.py/index")
         u_email = get_email(uid)
     except MySQLdb.Error, e:
         return errorMsg(e.value,req)
     if deletedId != "":
         t+=deleteSubmission(deletedId,deletedAction,deletedDoctype,u_email)
     t+="""
 <BR>
 <SMALL>
 <form>
 <input type=hidden value='%s' name=order>""" % order
     t+="""
 <input type=hidden name=deletedId>
 <input type=hidden name=deletedDoctype>
 <input type=hidden name=deletedAction>
  <table class="searchbox" width="100%" summary="">
     <tr>
         <th class="portalboxheader">For&nbsp;"""
     t+="<select name=doctype onchange=\"document.forms[0].submit();\"><option value=\"\">all types of document"
     res = run_sql("select ldocname,sdocname from sbmDOCTYPE order by ldocname")
     for row in res:
         if doctype==row[1]:
             t+="<option value=%s selected>%s" % (row[1],row[0])
         else:
             t+="<option value=%s>%s" % (row[1],row[0])
     t+="</th></tr><tr><td class=\"portalboxbody\">\n"
     t+="<table><tr><td></td></tr>"
     # request order default value
     reqorder = "sbmSUBMISSIONS.md DESC, lactname"
     # requested value
     if order == "actiondown":
         reqorder = "lactname ASC, sbmSUBMISSIONS.md DESC"
     elif order == "actionup":
         reqorder = "lactname DESC, sbmSUBMISSIONS.md DESC"
     elif order == "refdown":
         reqorder = "reference ASC, sbmSUBMISSIONS.md DESC, lactname DESC"
     elif order == "refup":
         reqorder = "reference DESC, sbmSUBMISSIONS.md DESC, lactname DESC"
     elif order == "cddown":
         reqorder = "sbmSUBMISSIONS.cd DESC, lactname"
     elif order == "cdup":
         reqorder = "sbmSUBMISSIONS.cd ASC, lactname"
     elif order == "mddown":
         reqorder = "sbmSUBMISSIONS.md DESC, lactname"
     elif order == "mdup":
         reqorder = "sbmSUBMISSIONS.md ASC, lactname"
     elif order == "statusdown":
         reqorder = "sbmSUBMISSIONS.status DESC, lactname"
     elif order == "statusup":
         reqorder = "sbmSUBMISSIONS.status ASC, lactname"
     if doctype != "":
         docselect = " and doctype='%s' " % doctype
     else:
         docselect = ""
     if u_email == "guest" or u_email == "":
         return warningMsg("<font color=red size=+1>You first have to login  before using this feature. Use the left menu to log in.</font>",req)
     else:
         res = run_sql("SELECT sbmSUBMISSIONS.* FROM sbmSUBMISSIONS,sbmACTION WHERE sactname=action and email=%s and id!='' "+docselect+" ORDER BY doctype,"+reqorder,(u_email,))
     currentdoctype = ""
     currentaction = ""
     currentstatus = ""
     num = 0
     for row in res:
         if currentdoctype != row[1]:
             currentdoctype = row[1]
             currentaction = ""
             currentstatus = ""
             res2 = run_sql("SELECT ldocname FROM sbmDOCTYPE WHERE  sdocname=%s",(currentdoctype,))
             ldocname = res2[0][0]
             t+= "</table>\n"
             t+="%s<br>\n" % ldocname
             t+="<table border=\"0\" class=\"searchbox\" align=\"left\" width=\"100%\">\n"
             t+="<tr><th class=headerselected>Action&nbsp;&nbsp;"
             t+="<a href='' onClick='document.forms[0].order.value=\"actiondown\";document.forms[0].submit();return false;'><img src=%s/smalldown.gif border=0></a>&nbsp;" % images
             t+="<a href='' onClick='document.forms[0].order.value=\"actionup\";document.forms[0].submit();return false;'><img src=%s/smallup.gif border=0></a></th>" % images
             t+="\n<th class=headerselected>Status&nbsp;&nbsp;"
             t+="<a href='' onClick='document.forms[0].order.value=\"statusdown\";document.forms[0].submit();return false;'><img src=%s/smalldown.gif border=0></a>&nbsp;" % images
             t+="<a href='' onClick='document.forms[0].order.value=\"statusup\";document.forms[0].submit();return false;'><img src=%s/smallup.gif border=0></a></th>" % images
             t+="\n<th class=headerselected>id</th><th class=headerselected>reference&nbsp;&nbsp;"
             t+="<a href='' onClick='document.forms[0].order.value=\"refdown\";document.forms[0].submit();return false;'><img src=%s/smalldown.gif border=0></a>&nbsp;" % images
             t+="<a href='' onClick='document.forms[0].order.value=\"refup\";document.forms[0].submit();return false;'><img src=%s/smallup.gif border=0></a></th>" % images
             t+="\n<th class=headerselected>first access&nbsp;&nbsp;"
             t+="<a href='' onClick='document.forms[0].order.value=\"cddown\";document.forms[0].submit();return false;'><img src=%s/smalldown.gif border=0></a>&nbsp;" % images
             t+="<a href='' onClick='document.forms[0].order.value=\"cdup\";document.forms[0].submit();return false;'><img src=%s/smallup.gif border=0></a></th>" % images
             t+="\n<th class=headerselected>last access&nbsp;&nbsp;"
             t+="<a href='' onClick='document.forms[0].order.value=\"mddown\";document.forms[0].submit();return false;'><img src=%s/smalldown.gif border=0></a>&nbsp;" % images
             t+="<a href='' onClick='document.forms[0].order.value=\"mdup\";document.forms[0].submit();return false;'><img src=%s/smallup.gif border=0></a></th></tr>\n" % images
         if currentaction != row[2]:
             currentaction = row[2]
             res2 = run_sql("SELECT lactname FROM sbmACTION WHERE  sactname=%s",(currentaction,))
             lactname = res2[0][0]
         else:
             lactname = "\""
         cdate = str(row[6]).replace(" ","&nbsp;")
         mdate= str(row[7]).replace(" ","&nbsp;")
         if currentstatus != row[3]:
             currentstatus = row[3]
             status=row[3]
         else:
             status = "\""
         if row[3] == "pending":
             idtext = "<a href=\"sub.py?access=%s@%s%s\">%s</a>" % (row[4],currentaction,currentdoctype,row[4])
             idtext+= "&nbsp;<a onClick='if (confirm(\"Are you sure you want to delete this submission?\")){document.forms[0].deletedId.value=\"%s\";document.forms[0].deletedDoctype.value=\"%s\";document.forms[0].deletedAction.value=\"%s\";document.forms[0].submit();return true;}else{return false;}' href=''><img src=%s/smallbin.gif border=0 alt='delete submission %s in %s'></a>" % (row[4],currentdoctype,currentaction,images,row[4],ldocname)
         else:
             idtext = row[4]
         if row[5] == "":
             reference = "<font color=red>not yet given</font>"
         else:
             reference = row[5]
         if operator.mod(num,2) == 0:
             t+= "<tr bgcolor=\"#e0e0e0\">\n"
         else:
             t+= "<tr bgcolor=\"#eeeeee\">\n"
         t+="<td align=center class=mycdscell><small>%s</small></td>\n<td align=center class=mycdscell><small>%s</small></td>\n<td class=mycdscell><small>" % (lactname,status)
         t+="%s</small></td>\n<td class=mycdscell><small>&nbsp;%s" % (idtext,reference)
         t+="</small></td>\n<td class=mycdscell><small>%s</small></td>\n<td class=mycdscell><small>" % cdate
         t+="%s</small></td>\n</tr>\n" % mdate
         num+=1
     t+="</table></td></tr></table></form>"
     
     return page(title="Your Submissions",
                 navtrail="""<a class="navtrail" href="%s/youraccount.py/display">Your Account</a>""" % weburl,
                 body=t,
                 description="",
                 keywords="",
                 uid=uid,
                 language=ln,
                 urlargs=req.args)
  
 def deleteSubmission(id, action, doctype, u_email):
     global storage
     run_sql("delete from sbmSUBMISSIONS WHERE doctype=%s and action=%s and email=%s and status='pending' and id=%s",(doctype,action,u_email,id,))
     res = run_sql("select dir from sbmACTION where sactname=%s",(action,))
     dir = res[0][0]
     if re.search("\.\.",doctype) == None and re.search("\.\.",id) == None and id != "":
         if os.path.exists("%s/%s/%s/%s" % (storage,dir,doctype,id)):
             os.rmdir("%s/%s/%s/%s" % (storage,dir,doctype,id))
     return ""
 
 def warningMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="warning",
                     body = title,
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 
 def errorMsg(title,req,c=cdsname,ln=cdslang):
     return page(title="error",
                     body = create_error_box(req, title=title,verbose=0, ln=ln),
                     description="%s - Internal Error" % c, 
                     keywords="%s, CDSware, Internal Error" % c,
                     language=ln,
                     urlargs=req.args)
 </protect>