3fe9249042
Changelog: https://sourceforge.net/p/group-office/code/HEAD/tree/branches/groupoffice-6.3/www/CHANGELOG.TXT
67 lines
2.4 KiB
PHP
67 lines
2.4 KiB
PHP
--- go/base/Config.php.orig 2018-05-16 17:51:27.698586000 +0200
|
|
+++ go/base/Config.php 2018-05-16 17:57:31.398294000 +0200
|
|
@@ -22,7 +22,7 @@
|
|
* This class holds the main configuration options of Group-Office
|
|
* Don't modify this file. The values defined here are just default values.
|
|
* They are overwritten by the configuration options in /config.php or
|
|
- * /etc/groupoffice/{HOSTNAME}/config.php
|
|
+ * /usr/local/usr/local/etc/groupoffice/{HOSTNAME}/config.php
|
|
*
|
|
* To edit these options use install.php.
|
|
*
|
|
@@ -873,7 +873,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
|
* @var StringHelper
|
|
* @access public
|
|
*/
|
|
- var $cmd_xml2wbxml = '/usr/bin/xml2wbxml';
|
|
+ var $cmd_xml2wbxml = '/usr/local/bin/xml2wbxml';
|
|
|
|
/**
|
|
* Command to convert wbxml to xml
|
|
@@ -881,7 +881,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
|
* @var StringHelper
|
|
* @access public
|
|
*/
|
|
- var $cmd_wbxml2xml = '/usr/bin/wbxml2xml';
|
|
+ var $cmd_wbxml2xml = '/usr/local/bin/wbxml2xml';
|
|
|
|
/**
|
|
* Command to unpack winmail.dat files
|
|
@@ -889,7 +889,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
|
* @var StringHelper
|
|
* @access public
|
|
*/
|
|
- var $cmd_tnef = '/usr/bin/tnef';
|
|
+ var $cmd_tnef = '/usr/local/bin/tnef';
|
|
|
|
/**
|
|
* Command to execute the php command line interface
|
|
@@ -897,7 +897,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
|
* @var StringHelper
|
|
* @access public
|
|
*/
|
|
- var $cmd_php = 'php';
|
|
+ var $cmd_php = '/usr/local/bin/php';
|
|
|
|
|
|
/**
|
|
@@ -1485,8 +1485,8 @@ var $billing_clear_payment_method_on_duplicate = true;
|
|
$this->root_path = str_replace('\\','/',dirname(dirname(dirname(__FILE__)))).'/';
|
|
|
|
//suppress error for open_basedir warnings etc
|
|
- if(@file_exists('/etc/groupoffice/globalconfig.inc.php')) {
|
|
- require('/etc/groupoffice/globalconfig.inc.php');
|
|
+ if(@file_exists('/usr/local/usr/local/etc/groupoffice/globalconfig.inc.php')) {
|
|
+ require('/usr/local/usr/local/etc/groupoffice/globalconfig.inc.php');
|
|
}
|
|
|
|
$config_file = $this->get_config_file();
|
|
@@ -1839,7 +1839,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
|
}
|
|
}*/
|
|
if(!empty($_SERVER['SERVER_NAME'])){
|
|
- $config_file = '/etc/groupoffice/'.$_SERVER['SERVER_NAME'].'/config.php';
|
|
+ $config_file = '/usr/local/usr/local/etc/groupoffice/'.$_SERVER['SERVER_NAME'].'/config.php';
|
|
if(@file_exists($config_file)) {
|
|
$_SESSION['GO_SESSION']['config_file']=$config_file;
|
|
return $config_file;
|