ZP-686 Replace $_SERVER["TERM"] with php_sapi_name(). Released under the...

ZP-686 Replace $_SERVER["TERM"] with php_sapi_name(). Released under the Affero GNU General Public License (AGPL) version 3.

src/backend/zarafa/listfolders.php

@@ -67,8 +67,8 @@ function main() {
 
 function listfolders_configure() {
 
-    if (!isset($_SERVER["TERM"]) || !isset($_SERVER["LOGNAME"])) {
-        echo "This script should not be called in a browser.\n";
+    if (php_sapi_name() != "cli") {
+        printf("This script should not be called in a browser. Called from: %s\n", php_sapi_name());
         exit(1);
     }
 

src/z-push-admin.php

@@ -191,8 +191,8 @@ class ZPushAdminCLI {
      * @access public
      */
     static public function CheckEnv() {
-        if (!isset($_SERVER["TERM"]) || !isset($_SERVER["LOGNAME"]))
-            self::$errormessage = "This script should not be called in a browser.";
+        if (php_sapi_name() != "cli")
+            self::$errormessage = sprintf("This script should not be called in a browser. Called from: %s", php_sapi_name());
 
         if (!function_exists("getopt"))
             self::$errormessage = "PHP Function getopt not found. Please check your PHP version and settings.";

tools/migrate-2.0.x-2.1.0.php

@@ -52,8 +52,8 @@ define('ZPUSH_BASE_PATH', "../src");
  * MAIN
 */
 try {
-    if (!isset($_SERVER["TERM"]) || !isset($_SERVER["LOGNAME"]))
-        die("This script should not be called in a browser.");
+    if (php_sapi_name() != "cli")
+        die(sprintf("This script should not be called in a browser. Called from: %s", php_sapi_name()));
 
     if (!defined('ZPUSH_BASE_PATH') || !file_exists(ZPUSH_BASE_PATH . "/config.php"))
         die("ZPUSH_BASE_PATH not set correctly or no config.php file found\n");