phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: phpgroupware header.inc.php.template,1.38,1.39


From: Miles Lott <address@hidden>
Subject: [Phpgroupware-cvs] CVS: phpgroupware header.inc.php.template,1.38,1.39
Date: Sun, 07 Apr 2002 19:56:04 -0400

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

Modified Files:
        header.inc.php.template 
Log Message:
Manageheader now handles editing of multiple domains



Index: header.inc.php.template
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/header.inc.php.template,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** header.inc.php.template     14 Feb 2002 18:57:11 -0000      1.38
--- header.inc.php.template     7 Apr 2002 23:56:02 -0000       1.39
***************
*** 24,37 ****
        $GLOBALS['phpgw_info']['server']['header_admin_password'] = 
'{HEADER_ADMIN_PASSWORD}';
  
!       $GLOBALS['phpgw_domain']['default'] = array (
!               'db_host' => '{DB_HOST}', 
!               'db_name' => '{DB_NAME}', 
!               'db_user' => '{DB_USER}', 
!               'db_pass' => '{DB_PASS}', 
!               // Look at the README file
!               'db_type' => '{DB_TYPE}',
!               // This will limit who is allowed to make configuration 
modifcations
!               'config_passwd' => '{CONFIG_PASS}'
!       );
  
        $GLOBALS['phpgw_info']['server']['db_persistent'] = {DB_PERSISTENT};
--- 24,35 ----
        $GLOBALS['phpgw_info']['server']['header_admin_password'] = 
'{HEADER_ADMIN_PASSWORD}';
  
!       /* phpGroupWare domain-specific db settings */{domains}
!       /*
!       ** If you want to have your domains in a select box, change to True
!       ** If not, users will have to login as address@hidden
!       ** Note: This is only for virtual domain support, default domain users 
can login only using
!       ** there loginid.
!       */
!       $GLOBALS['phpgw_info']['server']['show_domain_selectbox'] = 
{DOMAIN_SELECTBOX};
  
        $GLOBALS['phpgw_info']['server']['db_persistent'] = {DB_PERSISTENT};
***************
*** 45,56 ****
        $GLOBALS['phpgw_info']['server']['sessions_type'] = '{SESSIONS_TYPE}';
  
-       /*
-       ** If you want to have your domains in a select box, change to True
-       ** If not, users will have to login as address@hidden
-       ** Note: This is only for virtual domian support, default domain users 
can login only using
-       ** 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';
--- 43,46 ----
***************
*** 58,88 ****
        /* 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}';
  
        /*
!       ** This is a random string used as the initilazation vector for mcrypt
!    ** feel free to change it when setting up phpgroupware on a clean database,
        ** but you must not change it after that point!
        ** 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', 
-               'db_user'       => 'phpgroupware', 
-               'db_pass'       => 'their_password', 
-               'db_type'       => 'mysql',
-               'config_passwd' => 'changeme'
-       );
- */
- 
        /* 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
--- 48,65 ----
        /* 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}';
  
        /*
!       ** This is a random string used as the initialization vector for mcrypt
!       ** feel free to change it when setting up phpgroupware on a clean 
database,
        ** but you must not change it after that point!
        ** It should be around 30 bytes in length.
!       */
        $GLOBALS['phpgw_info']['server']['mcrypt_iv'] = '{MCRYPT_IV}';
  
        /* 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
***************
*** 102,111 ****
        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');
--- 79,88 ----
        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.21';
        /* 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');
***************
*** 117,119 ****
          Leave off the final php closing tag, some editors will add
          a \n or space after which will mess up cookies later on
!       */
--- 94,108 ----
          Leave off the final php closing tag, some editors will add
          a \n or space after which will mess up cookies later on
!       */<!-- BEGIN domain -->
!       $GLOBALS['phpgw_domain']['{DB_DOMAIN}'] = array (
!               'db_host' => '{DB_HOST}', 
!               'db_name' => '{DB_NAME}', 
!               'db_user' => '{DB_USER}', 
!               'db_pass' => '{DB_PASS}', 
!               // Look at the README file
!               'db_type' => '{DB_TYPE}',
!               // This will limit who is allowed to make configuration 
modifications
!               'config_passwd' => '{CONFIG_PASS}'
!       );
! 
! <!-- END domain -->




reply via email to

[Prev in Thread] Current Thread [Next in Thread]