Merge pull request #240 in ZP/z-push from develop to release/2.3

* commit '8cabbd51':
  ZP-905 Assign intersect result to variables before checking it with empty().
  ZP-932 z-push-admins actions lastsync and list on a user indicate if the device has already short folder ids or not.

src/lib/core/asdevice.php

@@ -715,6 +715,24 @@ class ASDevice extends StateObject {
         return $backendid;
     }
 
+    /**
+     * Indicates if the device has a folderid mapping (short ids).
+     *
+     * @access public
+     * @return boolean
+     */
+    public function HasFolderIdMapping() {
+        if (is_array($this->backend2folderidCache)) {
+            return true;
+        }
+        foreach ($this->contentData as $folderid => $data) {
+            if (isset($data[self::FOLDERBACKENDID])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Gets the supported fields transmitted previousely by the device
      * for a certain folder

src/lib/syncobjects/syncnote.php

@@ -127,10 +127,9 @@ class SyncNote extends SyncObject {
         // is a color other than yellow set
         if (isset($this->Color) && $this->Color != 3 && $this->Color > -1 && $this->Color < 5) {
             // check existing categories - do not rewrite category if the category is already a supported or unsupported color
-            if (!empty($this->categories) &&
-                    (!empty(array_intersect($this->categories, array_values(self::$unsupportedColors))) ||
-                     !empty(array_intersect($this->categories, array_values(self::$colors))) )) {
-
+            $insecUnsupp = array_intersect($this->categories, array_values(self::$unsupportedColors));
+            $insecColors = array_intersect($this->categories, array_values(self::$colors));
+            if (!empty($this->categories) && (!empty($insecUnsupp) || !empty($insecColors))) {
                 return false;
             }
             if(!isset($this->categories)) {

src/z-push-admin.php

@@ -438,7 +438,7 @@ class ZPushAdminCLI {
             echo "\tno devices found\n";
         else {
             echo "All known devices and users and their last synchronization time\n\n";
-            echo str_pad("Device id", 36). str_pad("Synchronized user", 31)."Last sync time\n";
+            echo str_pad("Device id", 36) . str_pad("Synchronized user", 31) . str_pad("Last sync time", 20) . "Short Ids\n";
             echo "-----------------------------------------------------------------------------------------------------\n";
         }
 
@@ -446,7 +446,9 @@ class ZPushAdminCLI {
             $users = ZPushAdmin::ListUsers($deviceId);
             foreach ($users as $user) {
                 $device = ZPushAdmin::GetDeviceDetails($deviceId, $user);
-                echo str_pad($deviceId, 36) . str_pad($user, 30) . " " . ($device->GetLastSyncTime() ? strftime("%Y-%m-%d %H:%M", $device->GetLastSyncTime()) : "never") . "\n";
+                $lastsync = $device->GetLastSyncTime() ? strftime("%Y-%m-%d %H:%M", $device->GetLastSyncTime()) : "never";
+                $hasShortFolderIds = $device->HasFolderIdMapping() ? "Yes":"No";
+                echo str_pad($deviceId, 36) . str_pad($user, 30) . " " . str_pad($lastsync, 20) . $hasShortFolderIds . "\n";
             }
         }
     }
@@ -819,6 +821,7 @@ class ZPushAdminCLI {
         echo "First sync:\t\t". strftime("%Y-%m-%d %H:%M", $device->GetFirstSyncTime()) ."\n";
         echo "Last sync:\t\t". ($device->GetLastSyncTime() ? strftime("%Y-%m-%d %H:%M", $device->GetLastSyncTime()) : "never")."\n";
         echo "Total folders:\t\t". count($folders). "\n";
+        echo "Short folder Ids:\t". ($device->HasFolderIdMapping() ? "Yes":"No") ."\n";
         echo "Synchronized folders:\t". $synchedFolders;
         if ($syncedFoldersInProgress > 0)
             echo " (". $syncedFoldersInProgress. " in progress)";