From d6a685b0d06c39c9da8fbbc9e720ccb17147be28 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 28 Nov 2013 13:26:11 +0100 Subject: Ajout options partage Poche et Diaspora MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Le partage n'est pas encore possible mais on peut préciser les urls dans la configuration Voir #175 --- app/controllers/configureController.php | 8 +++++++- app/i18n/en.php | 13 +++++++----- app/i18n/fr.php | 13 +++++++----- app/models/RSSConfiguration.php | 36 +++++++++++++++++++++++++++++++++ app/views/configure/sharing.phtml | 28 ++++++++++++++++++++++++- 5 files changed, 86 insertions(+), 12 deletions(-) diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php index b50b243cf..31885d30e 100755 --- a/app/controllers/configureController.php +++ b/app/controllers/configureController.php @@ -270,11 +270,17 @@ class configureController extends ActionController { public function sharingAction () { if (Request::isPost ()) { $urlShaarli = Request::param ('shaarli', ''); + $urlPoche = Request::param ('poche', ''); + $urlDiaspora = Request::param ('diaspora', ''); $this->view->conf->_urlShaarli ($urlShaarli); + $this->view->conf->_urlPoche ($urlPoche); + $this->view->conf->_urlDiaspora ($urlDiaspora); $values = array ( - 'url_shaarli' => $this->view->conf->urlShaarli () + 'url_shaarli' => $this->view->conf->urlShaarli (), + 'url_poche' => $this->view->conf->urlPoche (), + 'url_diaspora' => $this->view->conf->urlDiaspora () ); $confDAO = new RSSConfigurationDAO (); diff --git a/app/i18n/en.php b/app/i18n/en.php index b8bfebba9..06c439283 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -167,15 +167,17 @@ return array ( 'display_articles_unfolded' => 'Show articles unfolded by default', 'after_onread' => 'After marked as read,', 'jump_next' => 'jump to next unread sibling', - 'reading_icons' => 'Reading icons', - 'top_line' => 'Top line', - 'bottom_line' => 'Bottom line', + 'reading_icons' => 'Reading icons', + 'top_line' => 'Top line', + 'bottom_line' => 'Bottom line', 'img_with_lazyload' => 'Use "lazy load" mode to load pictures', 'auto_read_when' => 'Mark as read when', 'article_selected' => 'article is selected', 'article_open_on_website' => 'article is opened on its original website', 'scroll' => 'page scrolls', 'your_shaarli' => 'Your Shaarli', + 'your_poche' => 'Your Poche', + 'your_diaspora_pod' => 'Your Diaspora* pod', 'sharing' => 'Sharing', 'share' => 'Share', 'by_email' => 'By mail', @@ -183,6 +185,7 @@ return array ( 'optimize_bdd' => 'Optimize database', 'optimize_todo_sometimes' => 'To do occasionally to reduce size of database', 'theme' => 'Theme', + 'more_information' => 'More information', 'article' => 'Article', 'title' => 'Title', @@ -218,7 +221,7 @@ return array ( 'logs' => 'Logs', 'logs_empty' => 'Log file is empty', - 'clear_logs' => 'Clear the logs', + 'clear_logs' => 'Clear the logs', 'forbidden_access' => 'Forbidden access', 'forbidden_access_description' => 'Access is password protected, please sign in to read your feeds.', @@ -287,7 +290,7 @@ return array ( 'dom_is_nok' => 'You haven’t the necessary to browse the DOM (php-xml package can be useful)', 'cache_is_ok' => 'Permissions on cache directory are good', 'log_is_ok' => 'Permissions on logs directory are good', - 'favicons_is_ok' => 'Permissions on favicons directory are good', + 'favicons_is_ok' => 'Permissions on favicons directory are good', 'data_is_ok' => 'Permissions on data directory are good', 'file_is_nok' => 'Check permissions on %s directory. HTTP server must have rights to write into', 'fix_errors_before' => 'Fix errors before skip to the next step.', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index bb32382a5..1cc24a516 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -167,15 +167,17 @@ return array ( 'display_articles_unfolded' => 'Afficher les articles dépliés par défaut', 'after_onread' => 'Après marqué comme lu,', 'jump_next' => 'sauter au prochain voisin non lu', - 'reading_icons' => 'Icônes de lecture', - 'top_line' => 'Ligne du haut', - 'bottom_line' => 'Ligne du bas', + 'reading_icons' => 'Icônes de lecture', + 'top_line' => 'Ligne du haut', + 'bottom_line' => 'Ligne du bas', 'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images', 'auto_read_when' => 'Marquer comme lu lorsque', 'article_selected' => 'l’article est sélectionné', 'article_open_on_website' => 'l’article est ouvert sur le site d’origine', 'scroll' => 'au défilement de la page', 'your_shaarli' => 'Votre Shaarli', + 'your_poche' => 'Votre Poche', + 'your_diaspora_pod' => 'Votre pod Diaspora*', 'sharing' => 'Partage', 'share' => 'Partager', 'by_email' => 'Par mail', @@ -183,6 +185,7 @@ return array ( 'optimize_bdd' => 'Optimiser la base de données', 'optimize_todo_sometimes' => 'À faire de temps en temps pour réduire la taille de la BDD', 'theme' => 'Thème', + 'more_information' => 'Plus d’informations', 'article' => 'Article', 'title' => 'Titre', @@ -218,7 +221,7 @@ return array ( 'logs' => 'Logs', 'logs_empty' => 'Les logs sont vides', - 'clear_logs' => 'Effacer les logs', + 'clear_logs' => 'Effacer les logs', 'forbidden_access' => 'Accès interdit', 'forbidden_access_description' => 'L’accès est protégé par un mot de passe, veuillez vous connecter pour accéder aux flux.', @@ -287,7 +290,7 @@ return array ( 'dom_is_nok' => 'Vous ne disposez pas du nécessaire pour parcourir le DOM (voir du côté du paquet php-xml ?)', 'cache_is_ok' => 'Les droits sur le répertoire de cache sont bons', 'log_is_ok' => 'Les droits sur le répertoire des logs sont bons', - 'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons', + 'favicons_is_ok' => 'Les droits sur le répertoire des favicons sont bons', 'data_is_ok' => 'Les droits sur le répertoire de data sont bons', 'file_is_nok' => 'Veuillez vérifier les droits sur le répertoire %s. Le serveur HTTP doit être capable d’écrire dedans', 'fix_errors_before' => 'Veuillez corriger les erreurs avant de passer à l’étape suivante.', diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php index ef562bdcb..e6adf5c51 100755 --- a/app/models/RSSConfiguration.php +++ b/app/models/RSSConfiguration.php @@ -18,6 +18,8 @@ class RSSConfiguration extends Model { private $mail_login = ''; private $mark_when = array (); private $url_shaarli = ''; + private $url_poche = ''; + private $url_diaspora = ''; private $theme; private $anon_access; private $token; @@ -48,6 +50,8 @@ class RSSConfiguration extends Model { $this->_mailLogin ($confDAO->mail_login); $this->_markWhen ($confDAO->mark_when); $this->_urlShaarli ($confDAO->url_shaarli); + $this->_urlPoche ($confDAO->url_poche); + $this->_urlDiaspora ($confDAO->url_diaspora); $this->_theme ($confDAO->theme); RSSThemes::setThemeId ($confDAO->theme); $this->_anonAccess ($confDAO->anon_access); @@ -116,6 +120,12 @@ class RSSConfiguration extends Model { public function urlShaarli () { return $this->url_shaarli; } + public function urlPoche () { + return $this->url_poche; + } + public function urlDiaspora () { + return $this->url_diaspora; + } public function theme () { return $this->theme; } @@ -257,6 +267,24 @@ class RSSConfiguration extends Model { $this->url_shaarli = ''; } } + public function _urlPoche ($value) { + if (filter_var ($value, FILTER_VALIDATE_URL)) { + $this->url_poche = $value; + } elseif (version_compare(PHP_VERSION, '5.3.3', '<') && (strpos($value, '-') > 0) && ($value === filter_var($value, FILTER_SANITIZE_URL))) { //PHP bug #51192 + $this->url_poche = $value; + } else { + $this->url_poche = ''; + } + } + public function _urlDiaspora ($value) { + if (filter_var ($value, FILTER_VALIDATE_URL)) { + $this->url_diaspora = $value; + } elseif (version_compare(PHP_VERSION, '5.3.3', '<') && (strpos($value, '-') > 0) && ($value === filter_var($value, FILTER_SANITIZE_URL))) { //PHP bug #51192 + $this->url_diaspora = $value; + } else { + $this->url_diaspora = ''; + } + } public function _theme ($value) { $this->theme = $value; } @@ -334,6 +362,8 @@ class RSSConfigurationDAO extends Model_array { 'scroll' => 'no' ); public $url_shaarli = ''; + public $url_poche = ''; + public $url_diaspora = ''; public $theme = 'default'; public $anon_access = 'no'; public $token = ''; @@ -392,6 +422,12 @@ class RSSConfigurationDAO extends Model_array { if (isset ($this->array['url_shaarli'])) { $this->url_shaarli = $this->array['url_shaarli']; } + if (isset ($this->array['url_poche'])) { + $this->url_poche = $this->array['url_poche']; + } + if (isset ($this->array['url_diaspora'])) { + $this->url_diaspora = $this->array['url_diaspora']; + } if (isset ($this->array['theme'])) { $this->theme = $this->array['theme']; } diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml index e28122b00..0345b9a8d 100644 --- a/app/views/configure/sharing.phtml +++ b/app/views/configure/sharing.phtml @@ -6,9 +6,35 @@
- +
+ + +
+
+ +
+ +
+ + + +
+
+ +
+ +
+ + +
-- cgit v1.2.3