ZP-1205 Fixed issue so the highest restriction is used.

Released under the Affero GNU General Public License (AGPL) version 3.

src/lib/core/devicemanager.php

@@ -705,7 +705,7 @@ class DeviceManager {
         $maxDevice = $this->device->GetSyncFilterType();
 
         // ALL has a value of 0, all limitations have higher integer values, see SYNC_FILTERTYPE_ALL definition
-        if ($maxDevice !== false && $maxDevice < $maxAllowed) {
+        if ($maxDevice !== false && $maxDevice > SYNC_FILTERTYPE_ALL && ($maxAllowed == SYNC_FILTERTYPE_ALL || $maxDevice < $maxAllowed)) {
             $maxAllowed = $maxDevice;
         }
 

src/z-push-admin.php

@@ -917,8 +917,9 @@ class ZPushAdminCLI {
         echo "Last sync:\t\t". ($device->GetLastSyncTime() ? strftime("%Y-%m-%d %H:%M", $device->GetLastSyncTime()) : "never")."\n";
 
         $filterType = (defined('SYNC_FILTERTIME_MAX') && SYNC_FILTERTIME_MAX > SYNC_FILTERTYPE_ALL) ? SYNC_FILTERTIME_MAX : SYNC_FILTERTYPE_ALL;
-        if ($device->GetSyncFilterType() != false && $device->GetSyncFilterType() < $filterType) {
-            $filterType = $device->GetSyncFilterType();
+        $maxDevice = $device->GetSyncFilterType();
+        if ($maxDevice !== false && $maxDevice > SYNC_FILTERTYPE_ALL && ($filterType == SYNC_FILTERTYPE_ALL || $maxDevice < $filterType)) {
+            $filterType = $maxDevice;
         }
         switch($filterType) {
             case SYNC_FILTERTYPE_1DAY: