Report number of backup items.

horde · Aug 16, 2017 · 57b6a52 · 57b6a52
1 parent a76ccff
commit 57b6a52
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/framework/Backup/lib/Horde/Backup/Writer.php b/framework/Backup/lib/Horde/Backup/Writer.php
@@ -91,6 +91,11 @@ public function backup($application, Users $users)
 
     /**
      * Saves the backups.
+     *
+     * @param integer $format  The backup format, one of the Backup::FORMAT_*
+     *                         constants.
+     *
+     * @return integer  Number of processed items.
      */
     public function save($format = Backup::FORMAT_ZIP)
     {
@@ -115,6 +120,7 @@ public function save($format = Backup::FORMAT_ZIP)
         }
         $packer = new Json();
 
+        $count = 0;
         foreach ($backups as $name => $applications) {
             $data = array();
             foreach ($applications as $application => $backup) {
@@ -127,6 +133,7 @@ public function save($format = Backup::FORMAT_ZIP)
                             'name' => $dir . $id,
                             'data' => $stream
                         );
+                        $count++;
                     }
                 }
             }
@@ -140,5 +147,7 @@ public function save($format = Backup::FORMAT_ZIP)
             );
             fclose($archive);
         }
+
+        return $count;
     }
 }
diff --git a/horde/lib/Cli/Backup.php b/horde/lib/Cli/Backup.php
@@ -158,7 +158,11 @@ protected function _backup($dir, $apps, $users)
                 )
             );
         }
-        $writer->save();
+        $count = $writer->save();
+        $this->message(
+            sprintf(_("Saved %d items."), $count),
+            'cli.success'
+        );
     }
 
     /**