Merge pull request #467 in ZP/z-push from...

Merge pull request #467 in ZP/z-push from bugfix/ZP-1156-calling-z-push-admin-z-push-top-from to develop

* commit 'd589e5d4':
  ZP-1156 Calling z-push-admin/z-push-top from the kopano backend dir results in php traceback.

src/z-push-admin.php

@@ -28,9 +28,6 @@
 
 require_once 'vendor/autoload.php';
 
-if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
-include_once(ZPUSH_CONFIG);
-
 /**
  * //TODO resync of single folders of a users device
  */
@@ -40,6 +37,10 @@ include_once(ZPUSH_CONFIG);
  */
     define('BASE_PATH_CLI',  dirname(__FILE__) ."/");
     set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+
+    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', BASE_PATH_CLI . 'config.php');
+    include_once(ZPUSH_CONFIG);
+
     try {
         ZPush::CheckConfig();
         ZPushAdminCLI::CheckEnv();

src/z-push-top.php

@@ -28,15 +28,16 @@
 
 require_once 'vendor/autoload.php';
 
-if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
-include_once(ZPUSH_CONFIG);
-
 /************************************************
  * MAIN
  */
     declare(ticks = 1);
     define('BASE_PATH_CLI',  dirname(__FILE__) ."/");
     set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+
+    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', BASE_PATH_CLI . 'config.php');
+    include_once(ZPUSH_CONFIG);
+
     try {
         ZPush::CheckConfig();
         if (!function_exists("pcntl_signal"))

tools/list-shared-folders.php

@@ -59,7 +59,7 @@ try {
 
     require_once 'vendor/autoload.php';
 
-    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
+    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', BASE_PATH_CLI . 'config.php');
     include_once(ZPUSH_CONFIG);
 
     ZPush::CheckConfig();

tools/migrate-filestates-to-db.php

@@ -46,7 +46,7 @@ try {
 
     require_once 'vendor/autoload.php';
 
-    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
+    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', BASE_PATH_CLI . 'config.php');
     include_once(ZPUSH_CONFIG);