diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2026-06-15 22:10:15 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2026-06-15 22:10:15 +0300 |
| commit | 7d5e7b0f95992650189b73c6160264db6b658bde (patch) | |
| tree | b5e4229ed2119bcfc0b59cf3f634fd8fa503cf0c /classes/Handler | |
| parent | a15fe2d871772c78cacce00530211c391d52508e (diff) | |
| download | the-epube-7d5e7b0f95992650189b73c6160264db6b658bde.tar.gz the-epube-7d5e7b0f95992650189b73c6160264db6b658bde.tar.xz | |
import request with split methods and generate some tests
Diffstat (limited to 'classes/Handler')
| -rw-r--r-- | classes/Handler/CoverHandler.php | 2 | ||||
| -rw-r--r-- | classes/Handler/DefineHandler.php | 2 | ||||
| -rw-r--r-- | classes/Handler/DownloadHandler.php | 2 | ||||
| -rw-r--r-- | classes/Handler/LastreadHandler.php | 10 | ||||
| -rw-r--r-- | classes/Handler/ListHandler.php | 10 | ||||
| -rw-r--r-- | classes/Handler/LoginHandler.php | 6 | ||||
| -rw-r--r-- | classes/Handler/PaginationHandler.php | 6 | ||||
| -rw-r--r-- | classes/Handler/TogglefavHandler.php | 2 |
8 files changed, 20 insertions, 20 deletions
diff --git a/classes/Handler/CoverHandler.php b/classes/Handler/CoverHandler.php index 4e95e54..cd26308 100644 --- a/classes/Handler/CoverHandler.php +++ b/classes/Handler/CoverHandler.php @@ -13,7 +13,7 @@ class CoverHandler implements RequestHandlerInterface, AuthRequired { public function handle(Request $request): Response { - $id = (int) $request->getAttribute('id'); + $id = $request->getInt('id'); $db = new PDO('sqlite:' . Config::get(Config::CALIBRE_DB)); $sth = $db->prepare("SELECT has_cover, path FROM books WHERE id = ?"); $sth->execute([$id]); diff --git a/classes/Handler/DefineHandler.php b/classes/Handler/DefineHandler.php index 60d5b11..7906adc 100644 --- a/classes/Handler/DefineHandler.php +++ b/classes/Handler/DefineHandler.php @@ -32,7 +32,7 @@ class DefineHandler implements RequestHandlerInterface, AuthRequired return (new Response())->withBody(json_encode(["result" => ["Dictionary lookups are disabled."]])); } - $word = strip_tags(str_replace("", "", $request->getAttribute('word'))); + $word = strip_tags(str_replace("", "", $request->getString('word'))); $origWord = $word; $result = []; diff --git a/classes/Handler/DownloadHandler.php b/classes/Handler/DownloadHandler.php index 330c04f..da50c90 100644 --- a/classes/Handler/DownloadHandler.php +++ b/classes/Handler/DownloadHandler.php @@ -13,7 +13,7 @@ class DownloadHandler implements RequestHandlerInterface, AuthRequired { public function handle(Request $request): Response { - $bookid = (int) $request->getAttribute('id'); + $bookid = $request->getInt('id'); $caldb = new PDO('sqlite:' . Config::get(Config::CALIBRE_DB)); $sth = $caldb->prepare("SELECT path, name, format FROM data LEFT JOIN books ON (data.book = books.id) WHERE data.id = ?"); $sth->execute([$bookid]); diff --git a/classes/Handler/LastreadHandler.php b/classes/Handler/LastreadHandler.php index ab177ed..638db25 100644 --- a/classes/Handler/LastreadHandler.php +++ b/classes/Handler/LastreadHandler.php @@ -68,16 +68,16 @@ class LastreadHandler implements RequestHandlerInterface, AuthRequired public function handle(Request $request): Response { - $subOp = $request->getAttribute('op', ''); - $bookid = (int) $request->getAttribute('id'); + $subOp = $request->getString('op', ''); + $bookid = $request->getInt('id'); return match ($subOp) { 'getlastread' => $this->handleGet($bookid), 'storelastread' => $this->handleStore( $bookid, - (int) $request->getAttribute('page'), - (string) $request->getAttribute('cfi', ''), - (int) $request->getAttribute('timestamp'), + $request->getInt('page'), + $request->getString('cfi', ''), + $request->getInt('timestamp'), ), default => (new Response())->withStatus(404)->withBody(json_encode(["error" => "Not found."])), }; diff --git a/classes/Handler/ListHandler.php b/classes/Handler/ListHandler.php index 6628cee..e8a5916 100644 --- a/classes/Handler/ListHandler.php +++ b/classes/Handler/ListHandler.php @@ -14,16 +14,16 @@ class ListHandler implements RequestHandlerInterface, AuthRequired public function handle(Request $request): Response { $owner = $_SESSION["owner"] ?? ""; - $mode = $request->getAttribute('mode', ''); - $query = $request->getAttribute('query', ''); - $limit = (int) $request->getAttribute('limit', 60); - $offset = (int) $request->getAttribute('offset', 0); + $mode = $request->getString('mode', ''); + $query = $request->getString('query', ''); + $limit = $request->getInt('limit', 60); + $offset = $request->getInt('offset', 0); $ldb = \Db::pdo(); $caldb = new PDO('sqlite:' . Config::get(Config::CALIBRE_DB)); $ids = array_filter( - explode(",", $request->getAttribute('ids', '')), 'intval'); + explode(",", $request->getString('ids', '')), 'intval'); if ($mode == "favorites") { diff --git a/classes/Handler/LoginHandler.php b/classes/Handler/LoginHandler.php index f8a2b41..7fb1449 100644 --- a/classes/Handler/LoginHandler.php +++ b/classes/Handler/LoginHandler.php @@ -107,7 +107,7 @@ class LoginHandler implements RequestHandlerInterface public function handle(Request $request): Response { - $op = $request->getAttribute('op', ''); + $op = $request->getString('op', ''); // Redirect to OIDC provider if ($op === "perform-oidc-login") { @@ -150,8 +150,8 @@ class LoginHandler implements RequestHandlerInterface // Local username/password login if ($op === "perform-login") { - $username = trim(mb_strtolower($request->getAttribute('user', ''))); - $password = $request->getAttribute('password', ''); + $username = trim(mb_strtolower($request->getString('user', ''))); + $password = $request->getString('password', ''); if (!$username || !$password) { return (new Response()) diff --git a/classes/Handler/PaginationHandler.php b/classes/Handler/PaginationHandler.php index a027c58..3c0555b 100644 --- a/classes/Handler/PaginationHandler.php +++ b/classes/Handler/PaginationHandler.php @@ -67,12 +67,12 @@ class PaginationHandler implements RequestHandlerInterface, AuthRequired public function handle(Request $request): Response { - $subOp = $request->getAttribute('op', ''); - $bookid = (int) $request->getAttribute('id'); + $subOp = $request->getString('op', ''); + $bookid = $request->getInt('id'); return match ($subOp) { 'getpagination' => $this->handleGet($bookid), - 'storepagination' => $this->handleStore($bookid, $request->getAttribute('payload')), + 'storepagination' => $this->handleStore($bookid, $request->getString('payload')), 'deletepagination' => $this->handleDelete($bookid), default => (new Response())->withStatus(404)->withBody(json_encode(["error" => "Not found."])), }; diff --git a/classes/Handler/TogglefavHandler.php b/classes/Handler/TogglefavHandler.php index 3b203ad..d6a3913 100644 --- a/classes/Handler/TogglefavHandler.php +++ b/classes/Handler/TogglefavHandler.php @@ -12,7 +12,7 @@ class TogglefavHandler implements RequestHandlerInterface, AuthRequired { public function handle(Request $request): Response { - $bookid = (int) $request->getAttribute('id'); + $bookid = $request->getInt('id'); $owner = $_SESSION["owner"] ?? ""; $fav = ORM::for_table('epube_favorites') |
