aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--inc/3rdparty/site_config/standard/moo.nac.uci.edu.txt9
-rwxr-xr-xinc/poche/Database.class.php2
-rwxr-xr-xindex.php8
3 files changed, 14 insertions, 5 deletions
diff --git a/inc/3rdparty/site_config/standard/moo.nac.uci.edu.txt b/inc/3rdparty/site_config/standard/moo.nac.uci.edu.txt
new file mode 100644
index 00000000..24c949e9
--- /dev/null
+++ b/inc/3rdparty/site_config/standard/moo.nac.uci.edu.txt
@@ -0,0 +1,9 @@
1title: //div[@id='header']//h1[1]
2
3body: //div[@id='content']
4
5strip_id_or_class: toc
6
7prune: no
8
9test_url: http://moo.nac.uci.edu/~hjm/HOWTO_move_data.html
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 9e901974..dddb2512 100755
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -487,7 +487,7 @@ class Database {
487 $sql = 487 $sql =
488 "SELECT entries.* FROM entries 488 "SELECT entries.* FROM entries
489 LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id 489 LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id
490 WHERE tags_entries.tag_id = ? AND entries.user_id=?"; 490 WHERE tags_entries.tag_id = ? AND entries.user_id=? ORDER by entries.id DESC";
491 $query = $this->executeQuery($sql, array($tag_id, $user_id)); 491 $query = $this->executeQuery($sql, array($tag_id, $user_id));
492 $entries = $query->fetchAll(); 492 $entries = $query->fetchAll();
493 493
diff --git a/index.php b/index.php
index c134b103..481841ec 100755
--- a/index.php
+++ b/index.php
@@ -8,13 +8,13 @@
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
10 10
11define ('POCHE', '1.7.0'); 11define ('POCHE', '1.7.1');
12require 'check_setup.php'; 12require 'check_setup.php';
13require_once 'inc/poche/global.inc.php'; 13require_once 'inc/poche/global.inc.php';
14 14
15# Set error reporting level 15# Set error reporting level
16if (defined('ERROR_REPORTING')) { 16if (defined('ERROR_REPORTING')) {
17 error_reporting(ERROR_REPORTING); 17 error_reporting(ERROR_REPORTING);
18} 18}
19 19
20# Start session 20# Start session
@@ -98,7 +98,7 @@ if (isset($_GET['login'])) {
98 } 98 }
99 else { 99 else {
100 $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0); 100 $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0);
101 $poche->generateFeeds($_GET['token'], $_GET['user_id'], $tag_id, $_GET['type']); 101 $poche->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type']);
102 } 102 }
103} 103}
104 104