From fcb9280fc87c159539f5832ab35f174cd515654e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 23 Oct 2016 13:37:48 +0200 Subject: CLI export ZIP export, OPML export. Corrected height of feeds select in Pafat theme. https://github.com/FreshRSS/FreshRSS/pull/1338 https://github.com/FreshRSS/FreshRSS/issues/1039 https://github.com/FreshRSS/FreshRSS/issues/1277 --- cli/export-zip-for-user.php | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 cli/export-zip-for-user.php (limited to 'cli/export-zip-for-user.php') diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php new file mode 100644 index 000000000..f8d24238b --- /dev/null +++ b/cli/export-zip-for-user.php @@ -0,0 +1,30 @@ +#!/usr/bin/php + /path/to/file.zip'"); +} + +$username = cliInitUser($options['user']); + +fwrite(STDERR, 'FreshRSS exporting ZIP for user “' . $username . "”…\n"); + +$importController = new FreshRSS_importExport_Controller(); + +$ok = false; +try { + $ok = $importController->exportFile(true, true, true, + empty($options['max-feed-entries']) ? 100 : intval($options['max-feed-entries']), + $username); +} catch (FreshRSS_ZipMissing_Exception $zme) { + fail('FreshRSS error: Lacking php-zip extension!'); +} +invalidateHttpCache($username); + +done($ok); -- cgit v1.2.3 From 6d55a4f6b4e0ede12f1da495f9266bcd4ed89785 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 23 Oct 2016 13:41:12 +0200 Subject: +x execution rights export --- cli/export-opml-for-user.php | 0 cli/export-zip-for-user.php | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 cli/export-opml-for-user.php mode change 100644 => 100755 cli/export-zip-for-user.php (limited to 'cli/export-zip-for-user.php') diff --git a/cli/export-opml-for-user.php b/cli/export-opml-for-user.php old mode 100644 new mode 100755 diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php old mode 100644 new mode 100755 -- cgit v1.2.3 From 1f03e8a3aec8ff4b7bbba45bc3fd14a0552c2bc4 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 23 Oct 2016 13:44:14 +0200 Subject: CLI typo in usage example --- cli/export-opml-for-user.php | 2 +- cli/export-zip-for-user.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cli/export-zip-for-user.php') diff --git a/cli/export-opml-for-user.php b/cli/export-opml-for-user.php index bce4efd63..95b12281f 100755 --- a/cli/export-opml-for-user.php +++ b/cli/export-opml-for-user.php @@ -7,7 +7,7 @@ $options = getopt('', array( )); if (empty($options['user'])) { - fail('Usage: ' . basename(__FILE__) . " --user username > /path/to/file.opml.xml'"); + fail('Usage: ' . basename(__FILE__) . " --user username > /path/to/file.opml.xml"); } $username = cliInitUser($options['user']); diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php index f8d24238b..3004569cc 100755 --- a/cli/export-zip-for-user.php +++ b/cli/export-zip-for-user.php @@ -8,7 +8,7 @@ $options = getopt('', array( )); if (empty($options['user'])) { - fail('Usage: ' . basename(__FILE__) . " --user username --max-feed-entries 100 > /path/to/file.zip'"); + fail('Usage: ' . basename(__FILE__) . " --user username --max-feed-entries 100 > /path/to/file.zip"); } $username = cliInitUser($options['user']); -- cgit v1.2.3 From fac6c9881644160d168355af865b25285f27df82 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 24 Oct 2016 20:33:21 +0200 Subject: CLI minor usage update --- cli/export-zip-for-user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cli/export-zip-for-user.php') diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php index 3004569cc..9183a1c14 100755 --- a/cli/export-zip-for-user.php +++ b/cli/export-zip-for-user.php @@ -8,7 +8,7 @@ $options = getopt('', array( )); if (empty($options['user'])) { - fail('Usage: ' . basename(__FILE__) . " --user username --max-feed-entries 100 > /path/to/file.zip"); + fail('Usage: ' . basename(__FILE__) . " --user username ( --max-feed-entries 100 ) > /path/to/file.zip"); } $username = cliInitUser($options['user']); -- cgit v1.2.3 From c8e5292ab7a4670ff67e587f18d7973eee2f00e6 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 24 Oct 2016 21:58:22 +0200 Subject: CLI minor formatting https://github.com/FreshRSS/FreshRSS/issues/1095 --- cli/create-user.php | 3 +-- cli/export-zip-for-user.php | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'cli/export-zip-for-user.php') diff --git a/cli/create-user.php b/cli/create-user.php index c790acb59..008b82ce3 100755 --- a/cli/create-user.php +++ b/cli/create-user.php @@ -35,8 +35,7 @@ $ok = FreshRSS_user_Controller::createUser($username, 'language' => empty($options['language']) ? '' : $options['language'], 'token' => empty($options['token']) ? '' : $options['token'], ), - !isset($options['no-default-feeds']) - ); + !isset($options['no-default-feeds'])); if (!$ok) { fail('FreshRSS could not create user!'); diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php index 9183a1c14..92fe9bf9a 100755 --- a/cli/export-zip-for-user.php +++ b/cli/export-zip-for-user.php @@ -20,8 +20,8 @@ $importController = new FreshRSS_importExport_Controller(); $ok = false; try { $ok = $importController->exportFile(true, true, true, - empty($options['max-feed-entries']) ? 100 : intval($options['max-feed-entries']), - $username); + empty($options['max-feed-entries']) ? 100 : intval($options['max-feed-entries']), + $username); } catch (FreshRSS_ZipMissing_Exception $zme) { fail('FreshRSS error: Lacking php-zip extension!'); } -- cgit v1.2.3