Remove user data from all apps; improve messages.

horde · Sep 25, 2017 · df1a143 · df1a143
1 parent 47261d9
commit df1a143
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/horde/lib/Cli/Backup.php b/horde/lib/Cli/Backup.php
@@ -197,23 +197,23 @@ protected function _restore($dir, $apps, $users, $clear)
                     }
                     $resolved[] = $type;
                     $user = $collection->getUser();
-                    if ($clear && !isset($cleared[$user])) {
+                    if ($clear && !isset($cleared[$user][$app])) {
                         try {
                             $this->_registry->removeUserData($user, $app);
                             $this->message(
-                                sprintf(_("Removed user data from %s."), $type),
+                                sprintf(_("Removed user data from %s."), $app),
                                 'cli.success'
                             );
                         } catch (Horde_Exception $e) {
                             $this->message($e->getMessage(), 'cli.warning');
                         }
-                        $cleared[$user] = true;
+                        $cleared[$user][$app] = true;
                     }
                     $count = $this->_registry->callAppMethod(
                         $app, 'restore', array('args' => array($collection))
                     );
                     $this->message(
-                        sprintf(_("Restored %d items from %s."), $count, $type),
+                        sprintf(_("Restored %d items from %s %s."), $count, $app, $type),
                         'cli.success'
                     );
                 }