Skip to content

1.9 compatibility #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Niduroki wants to merge 2 commits into
base: master
Choose a base branch
from
Open

1.9 compatibility #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ec01d5
1.9 compatibility
Mar 25, 2023
67835be
Copy proper PDO escape from upstream
Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
<?php
/*
SQLite driver for YOURLS.
Version: 1.2
This driver requires YOURLS 1.7.4 -- not before -- not after!
Version: 1.3
This driver requires YOURLS 1.9.2 - may work with later versions, too.
Author: Ozh
*/

class CustomYDB extends \YOURLS\Database\YDB {
public function escape($string) {
// Copied escape function from base YDB
// https://github.com/YOURLS/YOURLS/blob/23d21fd996e771c4015f5d8b4ec1b06af122d60b/includes/Database/YDB.php#L429
return substr($this->quote($string), 1, -1);
}
}

yourls_db_sqlite_connect();

/**
Expand Down Expand Up @@ -39,7 +47,7 @@ function yourls_db_sqlite_connect() {
*/
$attributes = yourls_apply_filter( 'db_connect_attributes', array() ); // attributes as key-value pairs

$ydb = new \YOURLS\Database\YDB( $dsn, "", "", array(), $attributes );
$ydb = new CustomYDB( $dsn, "", "", array(), $attributes );
$ydb->init();

// Past this point, we're connected
Expand Down Expand Up @@ -141,7 +149,7 @@ function yourls_sqlite_last_24h_hits() {
FROM `yourls_log`
WHERE `shorturl` $keyword_range AND `click_time` > datetime('now', '-1 day')
GROUP BY `time`;";
$rows = $ydb->get_results( $query );
$rows = $ydb->fetchObjects( $query );

$_last_24h = array();
foreach( (array)$rows as $row ) {
Expand Down
2 changes: 1 addition & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# An unofficial SQLite Driver for YOURLS 1.8.2
# An unofficial SQLite Driver for YOURLS 1.9.2

This is a fork of a [fork](https://github.com/reanimus/yourls-sqlite) of the [original](https://github.com/ozh/yourls-sqlite), but now outdated SQLite driver for [YOURLS](https://yourls.org/). To my knowledge, it's the only actively maintained version, now with a readily available Docker image (thanks [@Niduroki](https://github.com/Niduroki)).

Expand Down