From ba68b6815ab31d17cda113e7990eeb07558b02a9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 14:23:35 +0400 Subject: db updates, remove init_connection() --- opml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'opml.php') diff --git a/opml.php b/opml.php index b8c9fb6c5..ad866fbd5 100644 --- a/opml.php +++ b/opml.php @@ -11,7 +11,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_connection($link)) return; + if (!init_plugins($link)) return; $op = $_REQUEST['op']; -- cgit v1.2.3 From 404e2e3603c852a3f82a21c14b8888005e2b3f99 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 15:36:34 +0400 Subject: more work on singleton-based DB --- opml.php | 1 + 1 file changed, 1 insertion(+) (limited to 'opml.php') diff --git a/opml.php b/opml.php index ad866fbd5..709cfd4cc 100644 --- a/opml.php +++ b/opml.php @@ -2,6 +2,7 @@ set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR . get_include_path()); + require_once "autoload.php"; require_once "functions.php"; require_once "sessions.php"; require_once "sanity_check.php"; -- cgit v1.2.3 From 6322ac79a020ab584d412d782d62b2ee77d7c6cf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 16:23:15 +0400 Subject: remove $link --- opml.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'opml.php') diff --git a/opml.php b/opml.php index 709cfd4cc..c8fbf1c39 100644 --- a/opml.php +++ b/opml.php @@ -12,21 +12,21 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_plugins($link)) return; + if (!init_plugins()) return; $op = $_REQUEST['op']; if ($op == "publish"){ - $key = db_escape_string($link, $_REQUEST["key"]); + $key = db_escape_string( $_REQUEST["key"]); - $result = db_query($link, "SELECT owner_uid + $result = db_query( "SELECT owner_uid FROM ttrss_access_keys WHERE access_key = '$key' AND feed_id = 'OPML:Publish'"); if (db_num_rows($result) == 1) { $owner_uid = db_fetch_result($result, 0, "owner_uid"); - $opml = new Opml($link, $_REQUEST); + $opml = new Opml( $_REQUEST); $opml->opml_export("", $owner_uid, true, false); } else { @@ -34,6 +34,6 @@ } } - db_close($link); + db_close(); ?> -- cgit v1.2.3 From eefaa2df381686f771396baae2d0ae71b345c2e7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Apr 2013 17:00:24 +0400 Subject: remove db_connect, db_close; CLI fixes --- opml.php | 4 ---- 1 file changed, 4 deletions(-) (limited to 'opml.php') diff --git a/opml.php b/opml.php index c8fbf1c39..b93221614 100644 --- a/opml.php +++ b/opml.php @@ -10,8 +10,6 @@ require_once "db.php"; require_once "db-prefs.php"; - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - if (!init_plugins()) return; $op = $_REQUEST['op']; @@ -34,6 +32,4 @@ } } - db_close(); - ?> -- cgit v1.2.3 From 1f294435307ef6cbbf3f35a22af9bf92131338ed Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Apr 2013 23:19:14 +0400 Subject: fix missing DB object when instantiated to import opml --- opml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'opml.php') diff --git a/opml.php b/opml.php index b93221614..af3694051 100644 --- a/opml.php +++ b/opml.php @@ -24,7 +24,7 @@ if (db_num_rows($result) == 1) { $owner_uid = db_fetch_result($result, 0, "owner_uid"); - $opml = new Opml( $_REQUEST); + $opml = new Opml($_REQUEST); $opml->opml_export("", $owner_uid, true, false); } else { -- cgit v1.2.3