[Phpgroupware-cvs] CVS: phpgroupware header.inc.php.template,1.35,1.36

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgroupware
In directory subversions:/tmp/cvs-serv25344

Modified Files:
        header.inc.php.template 
Log Message:
fixed header to use  and added my debug constants along with my replacement for 
print_debug

Index: header.inc.php.template
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/header.inc.php.template,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** header.inc.php.template     2 Jan 2002 15:47:54 -0000       1.35
--- header.inc.php.template     12 Feb 2002 09:10:39 -0000      1.36
***************
*** 22,28 ****
        define('PHPGW_SERVER_ROOT','{SERVER_ROOT}');
        define('PHPGW_INCLUDE_ROOT','{INCLUDE_ROOT}');
!       $phpgw_info['server']['header_admin_password'] = 
'{HEADER_ADMIN_PASSWORD}';
  
!       $phpgw_domain['default'] = array (
                'db_host' => '{DB_HOST}', 
                'db_name' => '{DB_NAME}', 
--- 22,28 ----
        define('PHPGW_SERVER_ROOT','{SERVER_ROOT}');
        define('PHPGW_INCLUDE_ROOT','{INCLUDE_ROOT}');
!       $GLOBALS['phpgw_info']['server']['header_admin_password'] = 
'{HEADER_ADMIN_PASSWORD}';
  
!       $GLOBALS['phpgw_domain']['default'] = array (
                'db_host' => '{DB_HOST}', 
                'db_name' => '{DB_NAME}', 
***************
*** 35,39 ****
        );
  
!       $phpgw_info['server']['db_persistent'] = {DB_PERSISTENT};
  
        /*
--- 35,39 ----
        );
  
!       $GLOBALS['phpgw_info']['server']['db_persistent'] = {DB_PERSISTENT};
  
        /*
***************
*** 51,63 ****
        ** there loginid.
        */
!       $phpgw_info['server']['show_domain_selectbox'] = {DOMAIN_SELECTBOX};
  
        /* Select which login template set you want, most people will use 
default */
!       $phpgw_info['login_template_set'] = 'default';
  
        /* This is used to control mcrypt's use */
!       $phpgw_info['server']['mcrypt_enabled'] = {ENABLE_MCRYPT};
        /* Set this to "old" for versions < 2.4, otherwise the exact mcrypt 
version you use. */
!       $phpgw_info['server']['versions']['mcrypt'] = '{MCRYPT_VERSION}';
  
        /*
--- 51,63 ----
        ** there loginid.
        */
!       $GLOBALS['phpgw_info']['server']['show_domain_selectbox'] = 
{DOMAIN_SELECTBOX};
  
        /* Select which login template set you want, most people will use 
default */
!       $GLOBALS['phpgw_info']['login_template_set'] = 'default';
  
        /* This is used to control mcrypt's use */
!       $GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = {ENABLE_MCRYPT};
        /* Set this to "old" for versions < 2.4, otherwise the exact mcrypt 
version you use. */
!       $GLOBALS['phpgw_info']['server']['versions']['mcrypt'] = 
'{MCRYPT_VERSION}';
  
        /*
***************
*** 67,76 ****
        ** It should be around 30 bytes in length.
     */
!       $phpgw_info['server']['mcrypt_iv'] = '{MCRYPT_IV}';
  
        /* Uncomment this out and use this for supporting different domains 
using this single install */
        /* (ignore if you are only supporting a single domain)*/
  /*
!       $phpgw_domain['domain2.com'] = array (
                'db_host'       => 'localhost', 
                'db_name'       => 'phpgw_domain2', 
--- 67,76 ----
        ** It should be around 30 bytes in length.
     */
!       $GLOBALS['phpgw_info']['server']['mcrypt_iv'] = '{MCRYPT_IV}';
  
        /* Uncomment this out and use this for supporting different domains 
using this single install */
        /* (ignore if you are only supporting a single domain)*/
  /*
!       $GLOBALS['phpgw_domain']['domain2.com'] = array (
                'db_host'       => 'localhost', 
                'db_name'       => 'phpgw_domain2', 
***************
*** 84,88 ****
        /* If you want phpGroupWare to be cached by proxy servers, uncomment 
the following */
        /* This is NOT recommended, but phpGroupWare should still work fine. */
!       if (!isset($phpgw_info['flags']['nocachecontrol']) || 
!$phpgw_info['flags']['nocachecontrol'] == True)
        {
                header('Cache-Control: no-cache, must-revalidate');  // HTTP/1.1
--- 84,88 ----
        /* If you want phpGroupWare to be cached by proxy servers, uncomment 
the following */
        /* This is NOT recommended, but phpGroupWare should still work fine. */
!       if (!isset($GLOBALS['phpgw_info']['flags']['nocachecontrol']) || 
!$GLOBALS['phpgw_info']['flags']['nocachecontrol'] == True)
        {
                header('Cache-Control: no-cache, must-revalidate');  // HTTP/1.1
***************
*** 90,93 ****
--- 90,98 ----
        }
  
+       /* debugging settings */
+       define('DEBUG_APP',  False);
+       define('DEBUG_API',  False);
+       define('DEBUG_LEVEL',  3);
+ 
        
/**************************************************************************\
        * Do not edit these lines                                               
   *
***************
*** 95,104 ****
        define('PHPGW_API_INC',PHPGW_INCLUDE_ROOT.'/phpgwapi/inc');
        include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php');
!       $phpgw_info["server"]["versions"]["phpgwapi"] = 
$setup_info['phpgwapi']['version'];
!       $phpgw_info['server']['versions']['current_header'] = 
$setup_info['phpgwapi']['versions']['current_header'];
        unset($setup_info);
!       $phpgw_info['server']['versions']['header'] = '1.19';
        /* This is a fix for NT */
!       if (!isset($phpgw_info['flags']['noapi']) || 
!$phpgw_info['flags']['noapi'] == True)
        {
                include(PHPGW_API_INC . '/functions.inc.php');
--- 100,109 ----
        define('PHPGW_API_INC',PHPGW_INCLUDE_ROOT.'/phpgwapi/inc');
        include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php');
!       $GLOBALS['phpgw_info']["server"]["versions"]["phpgwapi"] = 
$setup_info['phpgwapi']['version'];
!       $GLOBALS['phpgw_info']['server']['versions']['current_header'] = 
$setup_info['phpgwapi']['versions']['current_header'];
        unset($setup_info);
!       $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.20';
        /* This is a fix for NT */
!       if (!isset($GLOBALS['phpgw_info']['flags']['noapi']) || 
!$GLOBALS['phpgw_info']['flags']['noapi'] == True)
        {
                include(PHPGW_API_INC . '/functions.inc.php');