Merge pull request #36 from cy8aer/owncloud

Comment of OWNCLOUD_URL Parameter in owncloud.php

diff --git a/include/functions.php b/include/functions.php
index f0bd31831ab22d76ec18f3b16c133adf0beda350..d3dbfb07313ecdc139091432152e4e1a6df33ccf 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
        define('EXPECTED_CONFIG_VERSION', 26);
-       define('SCHEMA_VERSION', 101);
+       define('SCHEMA_VERSION', 102);
 
        $fetch_last_error = false;
        $pluginhost = false;

diff --git a/mobile/mobile-functions.php b/mobile/mobile-functions.php
index ffd7ba80d10b9c91f456c2104be78228ffb84897..65bba55df4e764df11f62fad4b3fdbf8118a357c 100644 (file)
--- a/mobile/mobile-functions.php
+++ b/mobile/mobile-functions.php
@@ -349,7 +349,7 @@
 
                $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
                        $view_mode, $is_cat, $search, $search_mode, $match_on,
-                       "score DESC, date_entered DESC", $offset);
+                       "score DESC, date_entered ".(mobile_get_pref($link, 'REVERSE_HEADLINES') ? 'ASC' : 'DESC'), $offset);
 
                $result = $qfh_ret[0];
                $feed_title = $qfh_ret[1];

diff --git a/mobile/mobile.js b/mobile/mobile.js
index 2771a8a40f48abbf9f1fc0f0a07e0dd6b71853cc..3fed3a1d70d332d112d3db42124f0aa4ff24381d 100644 (file)
--- a/mobile/mobile.js
+++ b/mobile/mobile.js
@@ -10,7 +10,7 @@ function toggleMarked(id, elem) {
                toggled = 0;
        }
 
-       var query = "?op=toggleMarked&id=" + id + "&mark=" + toggled;
+       var query = "op=toggleMarked&id=" + id + "&mark=" + toggled;
 
        new Ajax.Request(backend, {
                parameters: query,
@@ -29,7 +29,7 @@ function togglePublished(id, elem) {
                toggled = 0;
        }
 
-       var query = "?op=togglePublished&id=" + id + "&pub=" + toggled;
+       var query = "op=togglePublished&id=" + id + "&pub=" + toggled;
 
        new Ajax.Request(backend, {
                parameters: query,
@@ -49,7 +49,7 @@ function toggleUnread(id, elem) {
                toggled = 0;
        }
 
-       var query = "?op=toggleUnread&id=" + id + "&unread=" + toggled;
+       var query = "op=toggleUnread&id=" + id + "&unread=" + toggled;
 
        new Ajax.Request(backend, {
                parameters: query,
@@ -69,7 +69,7 @@ function setPref(elem) {
                toggled = 0;
        }
 
-       var query = "?op=setPref&id=" + id + "&to=" + toggled;
+       var query = "op=setPref&id=" + id + "&to=" + toggled;
 
        new Ajax.Request(backend, {
                parameters: query,

diff --git a/mobile/prefs.php b/mobile/prefs.php
index 59c2d04aee0c126393725ae99a690a9b780f58b6..6b053dc3b0aafadc6f505c55a82d566bf0e7d560 100644 (file)
--- a/mobile/prefs.php
+++ b/mobile/prefs.php
@@ -46,4 +46,9 @@
        <div class="toggle" id="SORT_FEEDS_UNREAD" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "SORT_FEEDS_UNREAD") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
 
+<div class="row">
+       <label><?php echo __('Reverse headline order (oldest first)') ?></label>
+       <div class="toggle" id="REVERSE_HEADLINES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "REVERSE_HEADLINES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+</div>
+
 </fieldset>

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index d4531308f80c92f2f4bf6757a8f940e081742025..10320b5b7d52e09072b3f37d78fc40b8546e8c6b 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -309,7 +309,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (101);
+insert into ttrss_version values (102);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
        content_url text not null,
@@ -455,6 +455,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_ENABLED_PLUGINS', 2, '', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', '', 1);
+
 update ttrss_prefs set access_level = 1 where pref_name in ('ON_CATCHUP_SHOW_NEXT_FEED',
        'SORT_HEADLINES_BY_FEED_DATE',
        'VFEED_GROUP_BY_FEED',

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index f52d4191d30fe30384cc65368daf0b156d7a5d62..33c32d181b483ec675831405836d9c31a9842d40 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -257,7 +257,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (101);
+insert into ttrss_version values (102);
 
 create table ttrss_enclosures (id serial not null primary key,
        content_url text not null,
@@ -395,6 +395,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_ENABLED_PLUGINS', 2, '', '', 1);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', '', 1);
+
 update ttrss_prefs set access_level = 1 where pref_name in ('ON_CATCHUP_SHOW_NEXT_FEED',
        'SORT_HEADLINES_BY_FEED_DATE',
        'VFEED_GROUP_BY_FEED',

diff --git a/schema/versions/mysql/102.sql b/schema/versions/mysql/102.sql
new file mode 100644 (file)
index 0000000..ccf5ef3
--- /dev/null
+++ b/schema/versions/mysql/102.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', '', 1);
+
+update ttrss_version set schema_version = 102;
+
+commit;

diff --git a/schema/versions/pgsql/102.sql b/schema/versions/pgsql/102.sql
new file mode 100644 (file)
index 0000000..ccf5ef3
--- /dev/null
+++ b/schema/versions/pgsql/102.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', '', 1);
+
+update ttrss_version set schema_version = 102;
+
+commit;