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

Merge pull request #546 in ZP/z-push from feature/ZP-1164-upgrading-z-push-common-could-take to develop

* commit '59a3107a':
  ZP-1164 Add config option to disable executing fixstates on upgrade.

build/deb/debian.z-push-common.postinst

@@ -5,7 +5,7 @@
 
 case "$1" in
     configure)
-        /usr/sbin/z-push-admin -a fixstates
+        /usr/sbin/z-push-admin -a fixstates-upgrade
         if [ $? -ne 0 ]; then
             YELLOW='\033[0;33m'
             NC='\033[0m' # No Color

src/z-push-admin.php

@@ -259,12 +259,25 @@ class ZPushAdminCLI {
                 self::$command = self::COMMAND_CLEARLOOP;
                 break;
 
-            // clear loop detection data
+            // fix states
             case "fixstates":
             case "fix":
                 self::$command = self::COMMAND_FIXSTATES;
                 break;
 
+            // hidden feature to run fixstates after upgrading the packages - this is called from postinst only
+            case "fixstates-upgrade":
+                // don't execute fixstates during upgrade if IGNORE_FIXSTATES_ON_UPGRADE is set to true
+                if (!defined('IGNORE_FIXSTATES_ON_UPGRADE') || IGNORE_FIXSTATES_ON_UPGRADE == false) {
+                    self::$command = self::COMMAND_FIXSTATES;
+                }
+                else {
+                    // print warning and exit gracefully
+                    echo "\nZ-Push: Not executing 'fixstates' as IGNORE_FIXSTATES_ON_UPGRADE is set. You should execute 'z-push-admin -a fixstates' manually!\n\n";
+                    exit(0);
+                }
+                break;
+
 
             default:
                 self::UsageInstructions();