From 8ee8a573f1f7e9cc45f9b3c46627d15670f14f3a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 29 Sep 2018 20:47:17 +0200 Subject: Custom labels (#2027) * First draft of custom tags https://github.com/FreshRSS/FreshRSS/issues/928 https://github.com/FreshRSS/FreshRSS/issues/1367 * SMALLINT to BIGINT for id_entry And uppercase SQL types * Fix layout for unreads * Start UI menu * Change menu order * Clean database helpers https://github.com/FreshRSS/FreshRSS/pull/2027#discussion_r217971535 * Travis rules do not understand PostgreSQL constants Grrr * Tag controller + UI * Add column attributes to tags * Use only favicon for now, for label * Fix styling for different themes * Constant for maximum InnoDB index length in Unicode https://github.com/FreshRSS/FreshRSS/pull/2027#discussion_r219052200 (I would have personnally prefered keeping the readability of a real value instead of a constant, in this case of many SQL fields) * Use FreshRSS_Factory::createCategoryDao * Add view of all articles containing any tag * Fix search in tags * Mark as read tags * Partial auto-update unread tags * More auto update tag unreads * Add tag deletion * Do not purge tagged articles * Minor comment * Fix SQLite and UI bug * Google Reader API support for user tags Add SQL check that tag names must be distinct from category names * whitespace * Add missing API for EasyRSS * Compatibility SQLite Problematic parentheses * Add SQL DISTINCT for cases with multiple tags * Fix for PostgreSQL PostgreSQL needs some additional type hint to avoid "could not determine data type of parameter $1" http://www.postgresql-archive.org/Could-not-determine-data-type-of-parameter-1-tp2171092p2171094.html --- app/Controllers/tagController.php | 80 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 app/Controllers/tagController.php (limited to 'app/Controllers/tagController.php') diff --git a/app/Controllers/tagController.php b/app/Controllers/tagController.php new file mode 100644 index 000000000..106e0afa8 --- /dev/null +++ b/app/Controllers/tagController.php @@ -0,0 +1,80 @@ +ajax = Minz_Request::param('ajax'); + if ($this->ajax) { + $this->view->_useLayout(false); + Minz_Request::_param('ajax'); + } + } + + /** + * This action adds (checked=true) or removes (checked=false) a tag to an entry. + */ + public function tagEntryAction() { + if (Minz_Request::isPost()) { + $id_tag = Minz_Request::param('id_tag'); + $name_tag = trim(Minz_Request::param('name_tag')); + $id_entry = Minz_Request::param('id_entry'); + $checked = Minz_Request::paramTernary('checked'); + if ($id_entry != false) { + $tagDAO = FreshRSS_Factory::createTagDao(); + if ($id_tag == 0 && $name_tag != '' && $checked) { + //Create new tag + $id_tag = $tagDAO->addTag(array('name' => $name_tag)); + } + if ($id_tag != 0) { + $tagDAO->tagEntry($id_tag, $id_entry, $checked); + } + } + } else { + Minz_Error::error(405); + } + if (!$this->ajax) { + Minz_Request::forward(array( + 'c' => 'index', + 'a' => 'index', + ), true); + } + } + + public function deleteAction() { + if (Minz_Request::isPost()) { + $id_tag = Minz_Request::param('id_tag'); + if ($id_tag != false) { + $tagDAO = FreshRSS_Factory::createTagDao(); + $tagDAO->deleteTag($id_tag); + } + } else { + Minz_Error::error(405); + } + if (!$this->ajax) { + Minz_Request::forward(array( + 'c' => 'index', + 'a' => 'index', + ), true); + } + } + + public function getTagsForEntryAction() { + $this->view->_useLayout(false); + header('Content-Type: application/json; charset=UTF-8'); + header('Cache-Control: private, no-cache, no-store, must-revalidate'); + $id_entry = Minz_Request::param('id_entry', 0); + $tagDAO = FreshRSS_Factory::createTagDao(); + $this->view->tags = $tagDAO->getTagsForEntry($id_entry); + } +} -- cgit v1.2.3