aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xapp/Controllers/indexController.php2
-rw-r--r--app/Controllers/subscriptionController.php5
-rw-r--r--app/Models/Category.php4
-rw-r--r--app/Models/CategoryDAO.php25
-rw-r--r--app/i18n/cz/sub.php2
-rw-r--r--app/i18n/de/sub.php2
-rw-r--r--app/i18n/en/sub.php2
-rwxr-xr-xapp/i18n/es/sub.php2
-rw-r--r--app/i18n/fr/sub.php2
-rw-r--r--app/i18n/he/sub.php2
-rw-r--r--app/i18n/it/sub.php2
-rw-r--r--app/i18n/kr/sub.php2
-rw-r--r--app/i18n/nl/sub.php2
-rw-r--r--app/i18n/oc/sub.php2
-rw-r--r--app/i18n/pt-br/sub.php2
-rw-r--r--app/i18n/ru/sub.php2
-rw-r--r--app/i18n/sk/sub.php2
-rw-r--r--app/i18n/tr/sub.php2
-rw-r--r--app/i18n/zh-cn/sub.php2
-rw-r--r--app/layout/aside_feed.phtml3
-rw-r--r--app/views/helpers/category/update.phtml7
21 files changed, 71 insertions, 5 deletions
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 2d791ce1d..967029fd1 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -173,7 +173,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
private function updateContext() {
if (empty(FreshRSS_Context::$categories)) {
$catDAO = FreshRSS_Factory::createCategoryDao();
- FreshRSS_Context::$categories = $catDAO->listCategories();
+ FreshRSS_Context::$categories = $catDAO->listSortedCategories();
}
// Update number of read / unread variables.
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index f9497f0be..b4520c8e6 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -19,7 +19,7 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
$catDAO->checkDefault();
$feedDAO->updateTTL();
- $this->view->categories = $catDAO->listCategories(false);
+ $this->view->categories = $catDAO->listSortedCategories(false);
$this->view->default_category = $catDAO->getDefault();
}
@@ -216,6 +216,9 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
]);
}
+ $position = Minz_Request::param('position');
+ $category->_attributes('position', '' === $position ? null : (int) $position);
+
$values = [
'name' => Minz_Request::param('name', ''),
'attributes' => $category->attributes(),
diff --git a/app/Models/Category.php b/app/Models/Category.php
index a0ee1ddaa..a195c88b3 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -98,14 +98,14 @@ class FreshRSS_Category extends Minz_Model {
}
public function _attributes($key, $value) {
- if ($key == '') {
+ if ('' == $key) {
if (is_string($value)) {
$value = json_decode($value, true);
}
if (is_array($value)) {
$this->attributes = $value;
}
- } elseif ($value === null) {
+ } elseif (null === $value) {
unset($this->attributes[$key]);
} else {
$this->attributes[$key] = $value;
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index 210830640..a0eda89e7 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -201,6 +201,29 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
}
}
+ public function listSortedCategories($prePopulateFeeds = true, $details = false) {
+ $categories = $this->listCategories($prePopulateFeeds, $details);
+
+ if (!is_array($categories)) {
+ return $categories;
+ }
+
+ usort($categories, function ($a, $b) {
+ $aPosition = $a->attributes('position');
+ $bPosition = $b->attributes('position');
+ if ($aPosition === $bPosition) {
+ return ($a->name() < $b->name()) ? -1 : 1;
+ } elseif (null === $aPosition) {
+ return 1;
+ } elseif (null === $bPosition) {
+ return -1;
+ }
+ return ($aPosition < $bPosition) ? -1 : 1;
+ });
+
+ return $categories;
+ }
+
public function listCategories($prePopulateFeeds = true, $details = false) {
if ($prePopulateFeeds) {
$sql = 'SELECT c.id AS c_id, c.name AS c_name, c.attributes AS c_attributes, '
@@ -343,6 +366,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
$feedDao->daoToFeed($feedsDao, $previousLine['c_id'])
);
$cat->_id($previousLine['c_id']);
+ $cat->_attributes('', $previousLine['c_attributes']);
$list[$previousLine['c_id']] = $cat;
$feedsDao = array(); //Prepare for next category
@@ -359,6 +383,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo implements FreshRSS_Searchable
$feedDao->daoToFeed($feedsDao, $previousLine['c_id'])
);
$cat->_id($previousLine['c_id']);
+ $cat->_attributes('', $previousLine['c_attributes']);
$list[$previousLine['c_id']] = $cat;
}
diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php
index eaaff9acd..fefc05699 100644
--- a/app/i18n/cz/sub.php
+++ b/app/i18n/cz/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Vyprázdit kategorii',
'information' => 'Informace',
'new' => 'Nová kategorie',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'Název',
),
'feed' => array(
diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php
index 1227b5559..6feb1d6e1 100644
--- a/app/i18n/de/sub.php
+++ b/app/i18n/de/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Leere Kategorie',
'information' => 'Information',
'new' => 'Neue Kategorie',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'Titel',
),
'feed' => array(
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 04ca793ec..765cbf964 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Empty category',
'information' => 'Information',
'new' => 'New category',
+ 'position' => 'Display position',
+ 'position_help' => 'To control category sort order',
'title' => 'Title',
),
'feed' => array(
diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php
index 96be76c6c..f2986ee5d 100755
--- a/app/i18n/es/sub.php
+++ b/app/i18n/es/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Vaciar categoría',
'information' => 'Información',
'new' => 'Nueva categoría',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'Título',
),
'feed' => array(
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index d09a19e5a..ff0d72a11 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Catégorie vide',
'information' => 'Informations',
'new' => 'Nouvelle catégorie',
+ 'position' => 'Position d’affichage',
+ 'position_help' => 'Pour contrôler l’ordre de tri des catégories',
'title' => 'Titre',
),
'feed' => array(
diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php
index 15965d9e2..2b806f6ff 100644
--- a/app/i18n/he/sub.php
+++ b/app/i18n/he/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Empty category', //TODO - Translation
'information' => 'מידע',
'new' => 'קטגוריה חדשה',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'כותרת',
),
'feed' => array(
diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php
index 22cd36986..400a0d259 100644
--- a/app/i18n/it/sub.php
+++ b/app/i18n/it/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Categoria vuota',
'information' => 'Informazioni',
'new' => 'Nuova categoria',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'Titolo',
),
'feed' => array(
diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php
index 2586395f2..eba732e22 100644
--- a/app/i18n/kr/sub.php
+++ b/app/i18n/kr/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => '빈 카테고리',
'information' => '정보',
'new' => '새 카테고리',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => '제목',
),
'feed' => array(
diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php
index 6b498132f..e4a0c7fdf 100644
--- a/app/i18n/nl/sub.php
+++ b/app/i18n/nl/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Lege categorie',
'information' => 'Informatie',
'new' => 'Nieuwe categorie',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'Titel',
),
'feed' => array(
diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php
index 0f465d7ca..ad3a10935 100644
--- a/app/i18n/oc/sub.php
+++ b/app/i18n/oc/sub.php
@@ -16,6 +16,8 @@ return array(
'empty' => 'Categoria voida',
'information' => 'Informacions',
'new' => 'Nòva categoria',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'Títol',
),
'feed' => array(
diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php
index c4c28bd6c..08ffc9a40 100644
--- a/app/i18n/pt-br/sub.php
+++ b/app/i18n/pt-br/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Categoria vazia',
'information' => 'Informações',
'new' => 'Nova categoria',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'Título',
),
'feed' => array(
diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php
index f4bda385d..47c7846e8 100644
--- a/app/i18n/ru/sub.php
+++ b/app/i18n/ru/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Empty category', //TODO - Translation
'information' => 'Information', //TODO - Translation
'new' => 'New category', //TODO - Translation
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'Title', //TODO - Translation
),
'feed' => array(
diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php
index 2167e1817..971cfb683 100644
--- a/app/i18n/sk/sub.php
+++ b/app/i18n/sk/sub.php
@@ -16,6 +16,8 @@ return array(
'empty' => 'Prázdna kategória',
'information' => 'Informácia',
'new' => 'Nová kategória',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'Názov',
),
'feed' => array(
diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php
index f6f40d3f7..45b84fe89 100644
--- a/app/i18n/tr/sub.php
+++ b/app/i18n/tr/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => 'Boş kategori',
'information' => 'Bilgi',
'new' => 'Yeni kategori',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => 'Başlık',
),
'feed' => array(
diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php
index f6f3a0f7a..bd00bacc6 100644
--- a/app/i18n/zh-cn/sub.php
+++ b/app/i18n/zh-cn/sub.php
@@ -17,6 +17,8 @@ return array(
'empty' => '空分类',
'information' => '信息',
'new' => '新分类',
+ 'position' => 'Display position', //TODO - Translation
+ 'position_help' => 'To control category sort order', //TODO - Translation
'title' => '标题',
),
'feed' => array(
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 4d5682001..e0c90282f 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -63,11 +63,12 @@
<?php
foreach ($this->categories as $cat) {
$feeds = $cat->feeds();
+ $position = $cat->attributes('position');
if (!empty($feeds)) {
$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
$c_show = $c_active || FreshRSS_Context::$user_conf->display_categories;
?>
- <li class="tree-folder category<?= $c_active ? ' active' : '' ?>" data-unread="<?= $cat->nbNotRead() ?>">
+ <li class="tree-folder category<?= $c_active ? ' active' : '' ?>"<?= null === $position ? '' : "data-position='$position'" ?> data-unread="<?= $cat->nbNotRead() ?>">
<div class="tree-folder-title">
<a class="dropdown-toggle" href="#"><?= _i($c_show ? 'up' : 'down') ?></a>
<a class="title<?= $cat->hasFeedsWithError() ? ' error' : '' ?>" data-unread="<?= format_number($cat->nbNotRead()) ?>" href="<?= _url('index', $actual_view, 'get', 'c_' . $cat->id()) ?>"><?= $cat->name() ?></a>
diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml
index 6a4c041ba..9e55e613d 100644
--- a/app/views/helpers/category/update.phtml
+++ b/app/views/helpers/category/update.phtml
@@ -17,6 +17,13 @@
?> />
</div>
</div>
+ <div class="form-group">
+ <label class="group-name" for="position"><?= _t('sub.category.position') ?></label>
+ <div class="group-controls">
+ <input type="number" name="position" id="position" min="1" value="<?= $this->category->attributes('position') ?>" />
+ <?= _i('help') ?> <?= _t('sub.category.position_help') ?>
+ </div>
+ </div>
<div class="form-group form-actions">
<div class="group-controls">
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-21 18:02:28 +0000