mirror of
https://github.com/wallabag/wallabag.git
synced 2024-05-20 10:08:04 +00:00
Add craue setting to enable sharing of origin url to Shaarli
Also fix the field name used in the query string and add it to baggy theme Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
Kevin Decherf
parent
773ac5b0f7
commit
893fd6434f
52
app/DoctrineMigrations/Version20171125164500.php
Normal file
52
app/DoctrineMigrations/Version20171125164500.php
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
<?php
|
||||
|
||||
namespace Application\Migrations;
|
||||
|
||||
use Doctrine\DBAL\Migrations\AbstractMigration;
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Add shaarli_share_origin_url in craue_config_setting.
|
||||
*/
|
||||
class Version20171125164500 extends AbstractMigration implements ContainerAwareInterface
|
||||
{
|
||||
/**
|
||||
* @var ContainerInterface
|
||||
*/
|
||||
private $container;
|
||||
|
||||
public function setContainer(ContainerInterface $container = null)
|
||||
{
|
||||
$this->container = $container;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function up(Schema $schema)
|
||||
{
|
||||
$shaarliShareOriginUrl = $this->container
|
||||
->get('doctrine.orm.default_entity_manager')
|
||||
->getConnection()
|
||||
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'shaarli_share_origin_url'");
|
||||
|
||||
$this->skipIf(false !== $shaarliShareOriginUrl, 'It seems that you already played this migration.');
|
||||
|
||||
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('shaarli_share_origin_url', '0', 'entry')");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Schema $schema
|
||||
*/
|
||||
public function down(Schema $schema)
|
||||
{
|
||||
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'shaarli_share_origin_url';");
|
||||
}
|
||||
|
||||
private function getTable($tableName)
|
||||
{
|
||||
return $this->container->getParameter('database_table_prefix') . $tableName;
|
||||
}
|
||||
}
|
||||
|
|
@ -37,3 +37,4 @@ demo_mode_username: "Demobruger"
|
|||
# restricted_access: Enable authentication for websites with paywall
|
||||
# api_user_registration: Enable user to be registered using the API
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -37,3 +37,4 @@ download_images_enabled: 'Bilder lokal herunterladen'
|
|||
restricted_access: 'Authentifizierung für Webseiten mit Paywall aktivieren'
|
||||
api_user_registration: 'Registrierung eines Benutzers über die API ermöglichen'
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -37,3 +37,4 @@ download_images_enabled: Download images locally
|
|||
restricted_access: Enable authentication for paywalled websites
|
||||
api_user_registration: Enable user to be registered using the API
|
||||
store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
@ -37,3 +37,4 @@ download_images_enabled: Descargar imágenes localmente
|
|||
restricted_access: Activar autenticación para websites con paywall
|
||||
# api_user_registration: Enable user to be registered using the API
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -37,3 +37,4 @@ modify_settings: "اعمال"
|
|||
# restricted_access: Enable authentication for websites with paywall
|
||||
# api_user_registration: Enable user to be registered using the API
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -37,3 +37,4 @@ download_images_enabled: Télécharger les images en local
|
|||
restricted_access: Activer l'authentification pour les articles derrière un paywall
|
||||
api_user_registration: Activer la création de compte depuis l'API
|
||||
store_article_headers: Activer le stockage des en-têtes HTTP de chaque article
|
||||
shaarli_share_origin_url: Activer le partage de l'adresse d'origine vers Shaarli, si le service est activé
|
||||
|
|
|
|||
|
|
@ -37,3 +37,4 @@ demo_mode_username: "Utente Demo"
|
|||
# restricted_access: Enable authentication for websites with paywall
|
||||
api_user_registration: Abilita la registrazione dell'utente attraverso l'API
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -37,3 +37,4 @@ download_images_enabled: Telecargar los imatges en local
|
|||
restricted_access: Activar l'autenticacion pels sites amb peatge
|
||||
api_user_registration: Autorizar los utilizaires a se marcar amb l'API
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -36,3 +36,4 @@ download_images_enabled: Pobierz obrazy lokalnie
|
|||
restricted_access: Włącz autoryzację dla stron z paywallem
|
||||
api_user_registration: Włącz rejestrację użytkownika przy użyciu API
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -37,3 +37,4 @@ demo_mode_username: "Usuário demo"
|
|||
# restricted_access: Enable authentication for websites with paywall
|
||||
# api_user_registration: Enable user to be registered using the API
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -37,3 +37,4 @@ modify_settings: "aplică"
|
|||
# restricted_access: Enable authentication for websites with paywall
|
||||
# api_user_registration: Enable user to be registered using the API
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -37,3 +37,4 @@ download_images_enabled: "Скачивать изображения локаль
|
|||
restricted_access: "Включить авторизацию на сайте с помощью paywall"
|
||||
# api_user_registration: Enable user to be registered using the API
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -34,3 +34,4 @@ share_public: ยอมรับ URL สาธารณะจากการเ
|
|||
download_images_enabled: ดาวน์โหลดรูปภาพเฉพาะ
|
||||
restricted_access: เปิดใช้งานการรองรับบนเว็บไซต์กับ paywall
|
||||
api_user_registration: เปิดใช้งานให้ผู้ใช้ลงทะเบียนการใช้ API
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -38,3 +38,4 @@
|
|||
# restricted_access: Enable authentication for websites with paywall
|
||||
# api_user_registration: Enable user to be registered using the API
|
||||
# store_article_headers: Enable if wallabag stores HTTP headers for each article
|
||||
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
|
||||
|
|
|
|||
|
|
@ -158,6 +158,10 @@ wallabag_core:
|
|||
name: store_article_headers
|
||||
value: 0
|
||||
section: entry
|
||||
-
|
||||
name: shaarli_share_origin_url
|
||||
value: 0
|
||||
section: entry
|
||||
|
||||
wallabag_user:
|
||||
registration_enabled: "%fosuser_registration%"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
{% endif %}
|
||||
{% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="Tweet"><span>Tweet</span></a></li>{% endif %}
|
||||
{% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="Email"><span>Email</span></a></li>{% endif %}
|
||||
{% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
|
||||
{% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&tags={{ entry.tags|join(',')|url_encode }}{% if craue_setting('shaarli_share_origin_url') %}&original_url={{ entry.originUrl|url_encode }}{% endif %}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
|
||||
{% if craue_setting('share_scuttle') %}<li><a href="{{ craue_setting('scuttle_url') }}/bookmarks.php?action=add&address={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--scuttle" title="scuttle"><span>scuttle</span></a></li>{% endif %}
|
||||
{% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}¬es=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %}
|
||||
{% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&title={{entry.title|url_encode}}&v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %}
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@
|
|||
{% endif %}
|
||||
{% if craue_setting('share_shaarli') %}
|
||||
<li>
|
||||
<a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}&lf_original_url={{ entry.originUrl|url_encode }}" target="_blank" title="shaarli" class="tool icon-image shaarli">
|
||||
<a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|striptags|url_encode }}&tags={{ entry.tags|join(',')|striptags|url_encode }}{% if craue_setting('shaarli_share_origin_url') %}&original_url={{ entry.originUrl|url_encode }}{% endif %}" target="_blank" title="shaarli" class="tool icon-image shaarli">
|
||||
<span>shaarli</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
Loading…
Reference in a new issue