@@ -29,7 +29,7 @@
- conf->token(); ?>
+ conf->token; ?>
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index d008e2e48..8f508487c 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -1,16 +1,16 @@
conf->markWhen ();
+ $mark = $this->conf->mark_when;
echo 'var ',
- 'hide_posts=', ($this->conf->displayPosts () === 'yes' || Minz_Request::param ('output') === 'reader') ? 'false' : 'true',
- ',auto_mark_article=', $mark['article'] === 'yes' ? 'true' : 'false',
- ',auto_mark_site=', $mark['site'] === 'yes' ? 'true' : 'false',
- ',auto_mark_scroll=', $mark['scroll'] === 'yes' ? 'true' : 'false',
- ',auto_load_more=', $this->conf->autoLoadMore () === 'yes' ? 'true' : 'false',
- ',full_lazyload=', $this->conf->lazyload () === 'yes' && ($this->conf->displayPosts () === 'yes' || Minz_Request::param ('output') === 'reader') ? 'true' : 'false',
- ',does_lazyload=', $this->conf->lazyload() === 'yes' ? 'true' : 'false';
+ 'hide_posts=', ($this->conf->display_posts || Minz_Request::param('output') === 'reader') ? 'false' : 'true',
+ ',auto_mark_article=', $mark['article'] ? 'true' : 'false',
+ ',auto_mark_site=', $mark['site'] ? 'true' : 'false',
+ ',auto_mark_scroll=', $mark['scroll'] ? 'true' : 'false',
+ ',auto_load_more=', $this->conf->auto_load_more ? 'true' : 'false',
+ ',full_lazyload=', $this->conf->lazyload && ($this->conf->display_posts || Minz_Request::param('output') === 'reader') ? 'true' : 'false',
+ ',does_lazyload=', $this->conf->lazyload ? 'true' : 'false';
- $s = $this->conf->shortcuts ();
+ $s = $this->conf->shortcuts;
echo ',shortcuts={',
'mark_read:"', $s['mark_read'], '",',
'mark_favorite:"', $s['mark_favorite'], '",',
diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml
index bc6e24e37..58ff13d4e 100644
--- a/app/views/helpers/view/global_view.phtml
+++ b/app/views/helpers/view/global_view.phtml
@@ -31,6 +31,6 @@
-
conf->displayPosts () === 'no' ? ' class="hide_posts"' : ''; ?>>
+
conf->display_posts ? '' : ' class="hide_posts"'; ?>>
-
\ No newline at end of file
+
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 4307c2113..f59cae2b8 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -18,8 +18,8 @@ if (!empty($this->entries)) {
$email = $this->conf->sharing ('email');
$print = $this->conf->sharing ('print');
$today = $this->today;
- $hidePosts = $this->conf->displayPosts() === 'no';
- $lazyload = $this->conf->lazyload() === 'yes';
+ $hidePosts = !$this->conf->display_posts;
+ $lazyload = $this->conf->lazyload;
?>
@@ -49,13 +49,13 @@ if (!empty($this->entries)) {
@@ -86,13 +86,13 @@ if (!empty($this->entries)) {
conf->bottomlineRead ()) {
+ if ($this->conf->bottomline_read) {
?>- isRead () ? 'read' : 'unread'); ?>
conf->bottomlineFavorite ()) {
+ if ($this->conf->bottomline_favorite) {
?>- isFavorite () ? 'starred' : 'non-starred'); ?>entries)) {
} ?>
-
conf->bottomlineSharing () && (
+ if ($this->conf->bottomline_sharing && (
$shaarli || $poche || $diaspora || $twitter ||
$google_plus || $facebook || $email
)) {
@@ -171,7 +171,7 @@ if (!empty($this->entries)) {
conf->bottomlineTags () ? $item->tags() : null;
+ $tags = $this->conf->bottomline_tags ? $item->tags() : null;
if (!empty($tags)) {
?>
-
@@ -190,8 +190,8 @@ if (!empty($this->entries)) {
- conf->bottomlineDate ()) { ?>
date (); ?>
- conf->bottomlineLink ()) { ?>
+ conf->bottomline_date) { ?>
date (); ?>
+ conf->bottomline_link) { ?>
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
index 47254f74e..2f64e672a 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/helpers/view/reader_view.phtml
@@ -2,7 +2,7 @@
$this->partial ('nav_menu');
if (!empty($this->entries)) {
- $lazyload = $this->conf->lazyload() === 'yes';
+ $lazyload = $this->conf->lazyload;
?>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 2d134ba4e..4db53e2a5 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -1,7 +1,7 @@
conf->token();
+$token = $this->conf->token;
$token_param = Minz_Request::param ('token', '');
$token_is_ok = ($token != '' && $token == $token_param);
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 306328904..3864a9335 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -225,14 +225,14 @@ class Minz_Configuration {
}
}
if (isset ($general['delay_cache'])) {
- self::$delay_cache = $general['delay_cache'];
+ self::$delay_cache = inval($general['delay_cache']);
}
if (isset ($general['default_user'])) {
self::$default_user = $general['default_user'];
self::$current_user = self::$default_user;
}
if (isset ($general['allow_anonymous'])) {
- self::$allow_anonymous = (bool)($general['allow_anonymous']);
+ self::$allow_anonymous = ((bool)($general['allow_anonymous'])) && ($general['allow_anonymous'] !== 'no');
}
// Base de données
diff --git a/lib/Minz/ModelArray.php b/lib/Minz/ModelArray.php
index 89d7f06c1..e3ec77dc9 100644
--- a/lib/Minz/ModelArray.php
+++ b/lib/Minz/ModelArray.php
@@ -8,11 +8,6 @@
* La classe Model_array représente le modèle interragissant avec les fichiers de type texte gérant des tableaux php
*/
class Minz_ModelArray {
- /**
- * $array Le tableau php contenu dans le fichier $filename
- */
- protected $array = array ();
-
/**
* $filename est le nom du fichier
*/
@@ -25,29 +20,32 @@ class Minz_ModelArray {
*/
public function __construct ($filename) {
$this->filename = $filename;
+ }
+ protected function loadArray() {
if (!file_exists($this->filename)) {
throw new Minz_FileNotExistException($this->filename, Minz_Exception::WARNING);
}
elseif (($handle = $this->getLock()) === false) {
throw new Minz_PermissionDeniedException($this->filename);
} else {
- $this->array = include($this->filename);
+ $data = include($this->filename);
$this->releaseLock($handle);
- if ($this->array === false) {
+ if ($data === false) {
throw new Minz_PermissionDeniedException($this->filename);
- } elseif (!is_array($this->array)) {
- $this->array = array();
+ } elseif (!is_array($data)) {
+ $data = array();
}
+ return $data;
}
}
/**
* Sauve le tableau $array dans le fichier $filename
**/
- protected function writeFile() {
- if (!file_put_contents($this->filename, "array, true) . ';', LOCK_EX)) {
+ protected function writeArray($array) {
+ if (!file_put_contents($this->filename, "filename);
}
return true;
diff --git a/lib/Minz/Session.php b/lib/Minz/Session.php
index f527322f5..6e45fd226 100644
--- a/lib/Minz/Session.php
+++ b/lib/Minz/Session.php
@@ -55,11 +55,6 @@ class Minz_Session {
} else {
$_SESSION[$p] = $v;
self::$session[$p] = $v;
-
- if($p == 'language') {
- // reset pour remettre à jour le fichier de langue à utiliser
- Minz_Translate::reset ();
- }
}
}
@@ -76,6 +71,7 @@ class Minz_Session {
if (!$force) {
self::_param ('language', $language);
+ Minz_Translate::reset ();
}
}
}
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index a27ef171a..3f55c7d58 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -63,7 +63,7 @@ function is_logged () {
// vérifie que le système d'authentification est configuré
function login_is_conf ($conf) {
- return $conf->mailLogin () != false;
+ return $conf->mail_login != '';
}
// tiré de Shaarli de Seb Sauvage //Format RFC 4648 base64url