Merge pull request #438 in ZP/z-push from hotfix/ZP-250-remove-obsolete-todos to release/2.3

* commit '28f39cda':
  ZP-250 Removed echo line, clearified TODO, removed other TODO.

src/lib/core/asdevice.php

@@ -865,7 +865,8 @@ class ASDevice extends StateObject {
         // check if a folder with that Name is already in the list and that its parent exists
         $parentFound = false;
         foreach ($this->additionalfolders as $k => $folder) {
-            // TODO: this parentid check should go into fixstates!
+            // This is fixed in fixstates, but we could keep this here a while longer.
+            // TODO: remove line at a later point.
             if (!isset($folder['parentid'])) $folder['parentid'] = "0";
 
             if ($folder['name'] == $name && $folder['parentid'] == $parentid) {
@@ -1087,7 +1088,6 @@ class ASDevice extends StateObject {
         foreach($toOrderFolders as $folder) {
             // move folders with the matching parentid to the ordered array
             if ($folder['parentid'] == $parentid) {
-                echo "found.. \n";
                 $fid = $folder['folderid'];
                 $orderedFolders[$fid] = $folder;
                 unset($toOrderFolders[$fid]);

src/lib/core/devicemanager.php

@@ -484,7 +484,7 @@ class DeviceManager {
             }
             if (!isset($df['parentid'])) {
                 $df['parentid'] = '0';
-                ZLog::Write(LOGLEVEL_WARN, sprintf("DeviceManager->GetAdditionalUserSyncFolders(): Additional folder '%s' has no parentid. // TODO FIX: Please run 'z-push-admin -a fixstates' to fix this issue.", $df['name']));
+                ZLog::Write(LOGLEVEL_WARN, sprintf("DeviceManager->GetAdditionalUserSyncFolders(): Additional folder '%s' has no parentid. Please run 'z-push-admin -a fixstates' to fix this issue.", $df['name']));
             }
 
             $folder = $this->getAdditionalSyncFolderObject($df['store'], $df['folderid'], $df['parentid'], $df['name'], $df['type'], $df['flags'], DeviceManager::FLD_ORIGIN_SHARED);