summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-23 13:35:54 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-23 13:35:54 +0100
commit7b7acf5c8738e949109672748dbd9f39a6e5a2c4 (patch)
tree1dfb450b8eaf29863116f20fa3e795e0865d2d54
parent9e46c1ee7fc7f9ad9e2c07f0cf826573dd4c9766 (diff)
Synchronisation quelques lignes blanches
-rw-r--r--README.md4
-rw-r--r--app/Models/CategoryDAO.php1
-rw-r--r--app/Models/Configuration.php1
-rw-r--r--app/Models/ConfigurationDAO.php1
-rw-r--r--app/Models/Entry.php1
-rw-r--r--app/Models/EntryDAO.php1
-rw-r--r--app/Models/Feed.php1
-rw-r--r--app/Models/FeedDAO.php1
-rw-r--r--app/Models/LogDAO.php1
-rw-r--r--public/install.php1
10 files changed, 11 insertions, 2 deletions
diff --git a/README.md b/README.md
index a45c8e67c..87ed9de99 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@ Il se veut léger et facile à prendre en main tout en étant un outil puissant
* Site officiel : http://marienfressinaud.github.io/FreshRSS/
* Démo : http://marienfressinaud.fr/projets/freshrss/
* Développeur : Marien Fressinaud <dev@marienfressinaud.fr>
-* Version actuelle : 0.7-dev
-* Date de publication 2013-12-xx
+* Version actuelle : 0.7-beta
+* Date de publication 2014-01-xx
* License [GNU AGPL 3](http://www.gnu.org/licenses/agpl-3.0.html)
![Logo de FreshRSS](http://marienfressinaud.fr/data/images/freshrss/freshrss_title.png)
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 3a810e9f0..6b07ab063 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -1,4 +1,5 @@
<?php
+
class FreshRSS_CategoryDAO extends Minz_ModelPdo {
public function addCategory ($valuesTmp) {
$sql = 'INSERT INTO `' . $this->prefix . 'category` (name, color) VALUES(?, ?)';
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index 7ef76b522..d5f69601f 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -1,4 +1,5 @@
<?php
+
class FreshRSS_Configuration extends Minz_Model {
private $available_languages = array (
'en' => 'English',
diff --git a/app/Models/ConfigurationDAO.php b/app/Models/ConfigurationDAO.php
index 57fc98047..0eebf2d90 100644
--- a/app/Models/ConfigurationDAO.php
+++ b/app/Models/ConfigurationDAO.php
@@ -1,4 +1,5 @@
<?php
+
class FreshRSS_ConfigurationDAO extends Minz_ModelArray {
public $language = 'en';
public $posts_per_page = 20;
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index 983f94727..ed31ef2b1 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -1,4 +1,5 @@
<?php
+
class FreshRSS_Entry extends Minz_Model {
private $id = 0;
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index d8bc869ae..c6bd5c404 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -1,4 +1,5 @@
<?php
+
class FreshRSS_EntryDAO extends Minz_ModelPdo {
public function addEntry ($valuesTmp) {
$sql = 'INSERT INTO `' . $this->prefix . 'entry`(id, guid, title, author, content_bin, link, date, is_read, is_favorite, id_feed, tags) '
diff --git a/app/Models/Feed.php b/app/Models/Feed.php
index e63ac8c7a..70efb0fa3 100644
--- a/app/Models/Feed.php
+++ b/app/Models/Feed.php
@@ -1,4 +1,5 @@
<?php
+
class FreshRSS_Feed extends Minz_Model {
private $id = 0;
private $url;
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 9ebea4a47..9bd480544 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -1,4 +1,5 @@
<?php
+
class FreshRSS_FeedDAO extends Minz_ModelPdo {
public function addFeed ($valuesTmp) {
$sql = 'INSERT INTO `' . $this->prefix . 'feed` (url, category, name, website, description, lastUpdate, priority, httpAuth, error, keep_history) VALUES(?, ?, ?, ?, ?, ?, 10, ?, 0, 0)';
diff --git a/app/Models/LogDAO.php b/app/Models/LogDAO.php
index bf043fd6d..06855ec66 100644
--- a/app/Models/LogDAO.php
+++ b/app/Models/LogDAO.php
@@ -1,4 +1,5 @@
<?php
+
class FreshRSS_LogDAO extends Minz_ModelTxt {
public function __construct () {
parent::__construct (LOG_PATH . '/application.log', 'r+');
diff --git a/public/install.php b/public/install.php
index 377b2916d..642692cd0 100644
--- a/public/install.php
+++ b/public/install.php
@@ -164,6 +164,7 @@ function initTranslate () {
$translates = array_merge($translates, include($file));
}
}
+
function getBetterLanguage ($fallback) {
$available = availableLanguages ();
$accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'];