summaryrefslogtreecommitdiff
path: root/www/groupoffice/files/patch-go_base_Config.php
blob: e23c328652d7d322398d549fe70c8d01f1abca5e (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
--- go/base/Config.php.orig	2016-07-25 13:35:05 UTC
+++ go/base/Config.php
@@ -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/etc/groupoffice/{HOSTNAME}/config.php
  *
  * To edit these options use install.php.
  *
@@ -786,7 +786,7 @@ class Config {
 	 * @var     StringHelper
 	 * @access  public
 	 */
-	var $cmd_xml2wbxml = '/usr/bin/xml2wbxml';
+	var $cmd_xml2wbxml = '/usr/local/bin/xml2wbxml';
 
 	/**
 	 * Command to convert wbxml to xml
@@ -794,7 +794,7 @@ class Config {
 	 * @var     StringHelper
 	 * @access  public
 	 */
-	var $cmd_wbxml2xml = '/usr/bin/wbxml2xml';
+	var $cmd_wbxml2xml = '/usr/local/bin/wbxml2xml';
 
 	/**
 	 * Command to unpack winmail.dat files
@@ -802,7 +802,7 @@ class Config {
 	 * @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
@@ -810,7 +810,7 @@ class Config {
 	 * @var     StringHelper
 	 * @access  public
 	 */
-	var $cmd_php = 'php';
+	var $cmd_php = '/usr/local/bin/php';
 
 
 	/**
@@ -1290,8 +1290,8 @@ class Config {
 		$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/etc/groupoffice/globalconfig.inc.php')) {
+			require('/usr/local/etc/groupoffice/globalconfig.inc.php');
 		}
 
 		$config_file = $this->get_config_file();
@@ -1615,13 +1615,13 @@ class Config {
 				}
 			}*/
 			if(!empty($_SERVER['SERVER_NAME'])){
-				$config_file = '/etc/groupoffice/'.$_SERVER['SERVER_NAME'].'/config.php';
+				$config_file = '/usr/local/etc/groupoffice/'.$_SERVER['SERVER_NAME'].'/config.php';
 				if(@file_exists($config_file)) {
 					$_SESSION['GO_SESSION']['config_file']=$config_file;
 					return $config_file;
 				}
 			}
-			$config_file = '/etc/groupoffice/config.php';
+			$config_file = '/usr/local/etc/groupoffice/config.php';
 			if(@file_exists($config_file)) {
 				$_SESSION['GO_SESSION']['config_file']=$config_file;
 				return $config_file;