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

Merge pull request #641 in ZP/z-push from feature/ZP-1192-expose-shared-folder-api-to-z-push-admin to develop

* commit '662e5b40':
  ZP-1192 Flags can be combined when adding a shared folder. Fixed unaccurate comment.
  ZP-1192 Remove a shared folder for a user with z-push-admin.
  ZP-1192 List more details on shared folders with z-push-admin.
  ZP-1192 Command to add a shared folders with z-push-admin.
  ZP-1192 List more details on shared folders with z-push-admin.

src/lib/utils/zpushadmin.php

@@ -715,12 +715,6 @@ class ZPushAdmin {
                 return false;
             }
 
-            $static_folders = ZPush::GetAdditionalSyncFolders();
-            if (isset($static_folders[$add_folderid])) {
-                ZLog::Write(LOGLEVEL_ERROR, sprintf("ZPushAdmin::AdditionalFolderRemove(): the folder id '%s' can not be removed as it is a statically configured folder. Aborting.", $add_folderid));
-                return false;
-            }
-
             $status = $device->RemoveAdditionalFolder($add_folderid);
             if ($status && $device->GetData() !== false) {
                 ZPush::GetStateMachine()->SetState($device->GetData(), $devid, IStateMachine::DEVICEDATA);