public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-09 14:49:15 +00:00
Code Issues Releases Wiki Activity

Extended Actions to include Select by tag (add local modifications, fix

Browse Source 
display for tags starting with a number)
This commit is contained in:
Craig Meyer
2011-08-11 18:51:00 -04:00
committed by Andrew Dolgov
parent 8efb5f62e8
commit 147f563228
7 changed files with 173 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
db.php
View File

@@ -3,14 +3,14 @@
require_once "config.php";
function db_connect($host, $user, $pass, $db) {
if (DB_TYPE == "pgsql") {
if (DB_TYPE == "pgsql") {
$string = "dbname=$db user=$user";
if ($pass) {
$string .= " password=$pass";
$string .= " password=$pass";
}
if ($host) {
$string .= " host=$host";
}
@@ -30,10 +30,10 @@ function db_connect($host, $user, $pass, $db) {
} else if (DB_TYPE == "mysql") {
$link = mysql_connect($host, $user, $pass);
if ($link) {
$result = mysql_select_db($db, $link);
$result = mysql_select_db($db, $link);
if (!$result) {
die("Can't select DB: " . mysql_error($link));
}
}
return $link;
} else {
die("Connection failed: " . mysql_error($link));
@@ -44,7 +44,7 @@ function db_connect($host, $user, $pass, $db) {
function db_escape_string($s, $strip_tags = true) {
if ($strip_tags) $s = strip_tags($s);
if (DB_TYPE == "pgsql") {
if (DB_TYPE == "pgsql") {
return pg_escape_string($s);
} else {
return mysql_real_escape_string($s);
@@ -57,7 +57,7 @@ function db_query($link, $query, $die_on_error = true) {
if (!$result) {
$query = htmlspecialchars($query); // just in case
if ($die_on_error) {
die("Query <i>$query</i> failed [$result]: " . pg_last_error($link));
die("Query <i>$query</i> failed [$result]: " . pg_last_error($link));
}
}
return $result;
@@ -131,4 +131,8 @@ function db_last_error($link) {
}
}
function db_quote($str){
return("'$str'");
}
?>