mirror of
https://github.com/moparisthebest/wallabag
synced 2024-11-30 04:42:19 -05:00
Merge pull request #819 from wallabag/fixSQLiteDownloadDB
Fix downloading SQLite database from all users
This commit is contained in:
commit
49882dc151
@ -124,8 +124,6 @@ class Routing
|
|||||||
} elseif (isset($_GET['import'])) {
|
} elseif (isset($_GET['import'])) {
|
||||||
$import = $this->wallabag->import();
|
$import = $this->wallabag->import();
|
||||||
$tplVars = array_merge($this->vars, $import);
|
$tplVars = array_merge($this->vars, $import);
|
||||||
} elseif (isset($_GET['download'])) {
|
|
||||||
Tools::downloadDb();
|
|
||||||
} elseif (isset($_GET['empty-cache'])) {
|
} elseif (isset($_GET['empty-cache'])) {
|
||||||
Tools::emptyCache();
|
Tools::emptyCache();
|
||||||
} elseif (isset($_GET['export'])) {
|
} elseif (isset($_GET['export'])) {
|
||||||
|
@ -294,21 +294,6 @@ final class Tools
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Download the sqlite database
|
|
||||||
*/
|
|
||||||
public static function downloadDb()
|
|
||||||
{
|
|
||||||
header('Content-Disposition: attachment; filename="poche.sqlite.gz"');
|
|
||||||
self::_status(200);
|
|
||||||
|
|
||||||
header('Content-Transfer-Encoding: binary');
|
|
||||||
header('Content-Type: application/octet-stream');
|
|
||||||
echo gzencode(file_get_contents(STORAGE_SQLITE));
|
|
||||||
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the content for a given URL (by a call to FullTextFeed)
|
* Get the content for a given URL (by a call to FullTextFeed)
|
||||||
*
|
*
|
||||||
|
@ -121,8 +121,6 @@
|
|||||||
<p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
|
<p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
|
||||||
|
|
||||||
<h2>{% trans "Export your wallabag data" %}</h2>
|
<h2>{% trans "Export your wallabag data" %}</h2>
|
||||||
{% if constant('STORAGE') == 'sqlite' %}
|
|
||||||
<p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
|
|
||||||
<p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
|
<p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
|
||||||
|
|
||||||
<h2>{% trans "Fancy an E-Book ?" %}</h2>
|
<h2>{% trans "Fancy an E-Book ?" %}</h2>
|
||||||
|
@ -121,7 +121,6 @@
|
|||||||
|
|
||||||
<h2>{% trans "Export your wallabag data" %}</h2>
|
<h2>{% trans "Export your wallabag data" %}</h2>
|
||||||
{% if constant('STORAGE') == 'sqlite' %}
|
{% if constant('STORAGE') == 'sqlite' %}
|
||||||
<p><a href="?download" target="_blank">{% trans "Click here" %}</a> {% trans "to download your database." %}</p>{% endif %}
|
|
||||||
<p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
|
<p><a href="?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
|
||||||
|
|
||||||
<h2>{% trans "Cache" %}</h2>
|
<h2>{% trans "Cache" %}</h2>
|
||||||
|
Loading…
Reference in New Issue
Block a user